jackmechem/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issues..

Browse source
This commit is contained in:
Jack Mechem 2026-04-03 15:59:12 -07:00
parent 5395bf80c9
commit 4f3b54842b
7 changed files with 253 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

210
flake.lock generated
View file

@ -1,5 +1,39 @@
{ {
"nodes": { "nodes": {
"claude-code": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1775174900,
"narHash": "sha256-Tb/CH58JcTv4hx7LFSLDHPpdEJLKXwoNM1yVOC2mh7k=",
"owner": "sadjow",
"repo": "claude-code-nix",
"rev": "9f95558d85c36bf37132889f4c5456284f7fe8e4",
"type": "github"
},
"original": {
"owner": "sadjow",
"repo": "claude-code-nix",
"type": "github"
}
},
"crane": {
"locked": {
"lastModified": 1775236976,
"narHash": "sha256-gCgX+AXN7K1gAIEqcLcZHxmC+QoZcwn9m6Z9r2Az+N8=",
"owner": "ipetkov",
"repo": "crane",
"rev": "6c23998526351a53ce734f0ac84940da988ccef1",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -36,10 +70,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gtkapps": { "gtkapps": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1753299093, "lastModified": 1753299093,
@ -57,15 +127,15 @@
}, },
"gtkbar": { "gtkbar": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1772153827, "lastModified": 1774395694,
"narHash": "sha256-xUjYgc6JhP6poKwC8eLipENIP8DBc0zJjQyowVWbEl0=", "narHash": "sha256-3lgJc02mSjwoFF4rmot3TLKkXAfG7EOOQG2pXn1XwgI=",
"owner": "JackMechem", "owner": "JackMechem",
"repo": "gtkbar", "repo": "gtkbar",
"rev": "c4915d89278f609777983030f8cf64f2bc08b3a8", "rev": "79161abfc138d7ccbb1d0207dc1c15e8d5220179",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773935367, "lastModified": 1775247674,
"narHash": "sha256-+RjULqqbCYmOJG+99pNqEGRJV7bX8DYPbxKUhKWFKsI=", "narHash": "sha256-MCaiC3iWarAsmu8KJXgJHb1H8lf+BD9gymvxkbmNVdc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7ec5440474cdcc9939cc67c320f01aea0a2f195", "rev": "03bdcf84f092956943dcf9ef164481e463512716",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773422513, "lastModified": 1774991950,
"narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,16 +187,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752950548, "lastModified": 1775095191,
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "narHash": "sha256-CsqRiYbgQyv01LS0NlC7shwzhDhjNDQSrhBX8VuD3nM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "rev": "106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -149,11 +219,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1752950548,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1775036866,
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,13 +251,59 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"claude-code": "claude-code",
"gtkapps": "gtkapps", "gtkapps": "gtkapps",
"gtkbar": "gtkbar", "gtkbar": "gtkbar",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"rust-app-menu": "rust-app-menu",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
"rust-app-menu": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1775253448,
"narHash": "sha256-Gah1BvO9hxpFO4iAZCd8pv58pd3qWU+7KuQ3ZX0DZ8M=",
"owner": "JackMechem",
"repo": "rust-app-menu",
"rev": "c1844481d8446536f24825846e7b3af4c6f96f40",
"type": "github"
},
"original": {
"owner": "JackMechem",
"repo": "rust-app-menu",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"rust-app-menu",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775099554,
"narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -202,6 +334,36 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -210,11 +372,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773737882, "lastModified": 1775237696,
"narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=", "narHash": "sha256-gECGt/SbcrGQZjeIYKY6WQtyaoLucOoEV8bpJaDVsEQ=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28", "rev": "9968536e8ee4f715554dfc994b5399982bcec9e5",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -17,14 +17,10 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
server-dash = {
url = "path:/home/jack/Projects/server-dash"; rust-app-menu.url = "github:JackMechem/rust-app-menu";
};
server-dash-api = {
url = "path:/home/jack/Projects/server-dash-api";
};
rust-app-menu.url = "path:/home/jack/Projects/rust-app-menu";
rust-app-menu.inputs.nixpkgs.follows = "nixpkgs"; rust-app-menu.inputs.nixpkgs.follows = "nixpkgs";
claude-code.url = "github:sadjow/claude-code-nix";
}; };
outputs = outputs =
@ -52,8 +48,8 @@
modules = [ modules = [
./hosts/dellserv/configuration.nix ./hosts/dellserv/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.server-dash.nixosModules.default (builtins.getFlake "path:/home/jack/Projects/server-dash").nixosModules.default
inputs.server-dash-api.nixosModules.default (builtins.getFlake "path:/home/jack/Projects/server-dash-api").nixosModules.default
]; ];
}; };
}; };

6
hosts/desktop/configuration.nix
View file

@ -48,9 +48,13 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
services.gtkapps.enable = true; # services.gtkapps.enable = true;
services.gtkbar.enable = true; services.gtkbar.enable = true;
environment.systemPackages = [
inputs.rust-app-menu.packages.${pkgs.system}.default
];
# services.midirun = { # services.midirun = {
# enable = true; # enable = true;
# }; # };

2
hosts/desktop/home.nix
View file

@ -46,6 +46,8 @@
package = pkgs.kanagawa-gtk-theme; package = pkgs.kanagawa-gtk-theme;
}; };
gtk4.theme = config.gtk.theme;
iconTheme = { iconTheme = {
name = "Papirus-Dark"; name = "Papirus-Dark";
package = pkgs.papirus-icon-theme; package = pkgs.papirus-icon-theme;

4
modules/home-manager/homepackages.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { inputs, pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
### Desktop Stuff ### Desktop Stuff
@ -36,6 +36,6 @@
### Development Tools ### Development Tools
jdk jdk
gnumake gnumake
claude-code inputs.claude-code.packages.${pkgs.system}.claude-code
]; ];
} }

3
modules/home-manager/hyprland-desktop.nix
View file

@ -38,6 +38,7 @@
exec-once = [ exec-once = [
"waypaper --restore" "waypaper --restore"
"gtkbar" "gtkbar"
"rust-app-menu"
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"solaar -w hide" "solaar -w hide"
]; ];
@ -45,7 +46,7 @@
# --- Variables --- # --- Variables ---
"$terminal" = "ghostty"; "$terminal" = "ghostty";
"$fileManager" = "thunar"; "$fileManager" = "thunar";
"$menu" = "gtkapps"; "$menu" = "rust-app-menu";
env = [ env = [
"XCURSOR_SIZE,24" "XCURSOR_SIZE,24"

12
modules/home-manager/neovimpackages.nix
View file

@ -10,12 +10,12 @@
# javascript/typescript/react # javascript/typescript/react
nodejs_20 nodejs_20
typescript typescript
nodePackages.typescript-language-server typescript-language-server
nodePackages.vscode-langservers-extracted vscode-langservers-extracted
nodePackages.bash-language-server bash-language-server
nodePackages.prettier prettier
nodePackages.eslint_d eslint_d
nodePackages.eslint eslint
# nix # nix
nil nil
nixd nixd