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

updates and cleanup

Browse source
This commit is contained in:
Julian Sutter 2025-11-03 09:25:36 -08:00
parent de62048229
commit e80cc15caf
6 changed files with 26 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/dev.nix
View file

@ -9,7 +9,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(python3.withPackages(ps: with ps; [ pandas requests python-dotenv pip uv ])) (python3.withPackages(ps: with ps; [ pandas requests python-dotenv pip uv ]))
nodejs nodejs
rpi-imager # rpi-imager
putty # SSH/Telnet client putty # SSH/Telnet client
pkgs-unstable.windsurf # Use windsurf from unstable packages pkgs-unstable.windsurf # Use windsurf from unstable packages
]; ];

1
desktop/plasma.nix
View file

@ -35,7 +35,6 @@
pinentry # GUI pinentry for GPG pinentry # GUI pinentry for GPG
tigervnc # VNC client/server tigervnc # VNC client/server
firefox # Web browser firefox # Web browser
rustdesk
]; ];
# GNUPG Stuff # GNUPG Stuff

36
flake.lock generated
View file

@ -166,11 +166,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1761129162, "lastModified": 1761869718,
"narHash": "sha256-vJYlThaqdSYRKn1HcaMbkHeB95bXQwgG1ugrlSKQjHg=", "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "057695bc3f7de5e8841c15252fc51029590895e4", "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +353,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1760958188, "lastModified": 1762179181,
"narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "narHash": "sha256-T4+TNfXlF/gHbcNCC2HY7sMGBKgqNzyYeMBWmcbH7/o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "rev": "256770618502d2eda892af3ae91da5e386ce9586",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1760878510, "lastModified": 1761114652,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +385,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1761114652, "lastModified": 1761907660,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +400,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761016216, "lastModified": 1761999846,
"narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +423,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761078382, "lastModified": 1762115864,
"narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "narHash": "sha256-KREKZiBAkAnqJC+jvY+vSbLlrg8j6DFEU7Lv+tgOlHI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "rev": "8e9e76efa3cc811c230512b40d8cfde06e40da5b",
"type": "github" "type": "github"
}, },
"original": { "original": {

28
flake.nix
View file

@ -35,7 +35,6 @@
specialArgs = commonSpecialArgs; specialArgs = commonSpecialArgs;
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
hyprland.nixosModules.default
] ++ hardware ++ modules; ] ++ hardware ++ modules;
}; };
@ -51,31 +50,14 @@
./desktop/virtualization.nix ./desktop/virtualization.nix
]; ];
# Hyprland desktop modules (for transition)
hyprlandDesktopModules = [
./systems/common.nix
./users/jsutter.nix
./desktop/hyprland.nix
./desktop/dev.nix
./desktop/office.nix
./desktop/gaming.nix
./desktop/media.nix
./desktop/virtualization.nix
];
in { in {
nixosConfigurations = { nixosConfigurations = {
framework = mkSystem { framework = mkSystem {
hardware = [ nixos-hardware.nixosModules.framework-16-7040-amd ]; hardware = [ nixos-hardware.nixosModules.framework-13-ai-300-amd ];
modules = commonDesktopModules ++ [ modules = commonDesktopModules ++ [
./systems/framework.nix ./systems/framework.nix
]; ];
}; };
framework-hyprland = mkSystem {
hardware = [ nixos-hardware.nixosModules.framework-16-7040-amd ];
modules = hyprlandDesktopModules ++ [
./systems/framework.nix
];
};
aurora = mkSystem { aurora = mkSystem {
modules = commonDesktopModules ++ [ modules = commonDesktopModules ++ [
./systems/aurora.nix ./systems/aurora.nix
@ -92,14 +74,6 @@
./users/jsutter.nix ./users/jsutter.nix
]; ];
}; };
skip01 = mkSystem {
modules = [
./systems/common-headless.nix
./systems/skip01.nix
./users/jsutter.nix
./servers/common.nix
];
};
}; };
}; };
} }

10
systems/labrizor.nix
View file

@ -18,9 +18,9 @@
# rocm-opencl-runtime # rocm-opencl-runtime
# ]; # ];
networking.bridges = { # networking.bridges = {
"br0" = { # "br0" = {
interfaces = [ "eth0" ]; # interfaces = [ "eth0" ];
}; # };
}; # };
} }

1
users/jsutter.nix
View file

@ -14,7 +14,6 @@
# GUI applications have been moved to appropriate desktop modules # GUI applications have been moved to appropriate desktop modules
direnv # Development environment management direnv # Development environment management
appimage-run # System utility for AppImages appimage-run # System utility for AppImages
cloudflared # Cloudflare tunnel CLI
]; ];
}; };