chris/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: chris/nixos:2d94b4ed1272195ae15053156171eb8c88225f24
Branches Tags
chris/nixos:main
...
compare: chris/nixos:5255ce37098d2a3b66fae1f9505ffec40db5f8b9
Branches Tags
chris/nixos:main
2 Commits
2d94b4ed12 ... 5255ce3709
Author SHA1 Message Date
chris 5255ce3709 Cleaning up and fixing 2026-08-16 12:36:59 +01:00
chris 7982e77c12 Update 2026-08-15 21:21:16 +01:00
12 changed files with 127 additions and 163 deletions
Expand all files Collapse all files
flake.lock
Generated
+85 -92
View File
@@ -25,11 +25,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1781164160, "lastModified": 1784365424,
"narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=", "narHash": "sha256-kJO1Tww/GkvLq5amrV4BKidYGr5YumM+cH/xYALAiw4=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "elephant", "repo": "elephant",
"rev": "3296842820d04d5ec774afc7528492fcbb3c01f2", "rev": "23f37238367355cf46843015ad5e94706200176a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -46,11 +46,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1782878575, "lastModified": 1786766570,
"narHash": "sha256-sw0B1D//VBGXLQZJXXFLjunnMfO7hCZ5S1kv06BBO5A=", "narHash": "sha256-aKICdV1hUtO8Nn6XRBJ4n1B0zVYTYIJrjww/QL5tXIc=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "e5d8f0375b4613d200e8efd64df2183a75290c4e", "rev": "1fbf8c892ec48fa84cd2a7a6d60425b210c69d93",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -81,11 +81,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1778716662, "lastModified": 1785627969,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -136,18 +136,17 @@
"nix-gaming", "nix-gaming",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nix-gaming", "nix-gaming",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1781733627, "lastModified": 1784288435,
"narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -156,28 +155,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"nix-gaming",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -185,16 +162,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782704057, "lastModified": 1786824011,
"narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=", "narHash": "sha256-f7I9xNDaZLO1rLPzZxjc6ZGRQYuIVbgs1iLFm44YFJ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "868d0a692de703c2de98fab61968e4e310b7c28e", "rev": "58405b3b0ce13e9cd4af7dc697687b4d9b74e56d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -247,11 +224,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1782879690, "lastModified": 1786789564,
"narHash": "sha256-pPA8uv71nqPxxsF1wU1m0gnP4+G+pZtfcEIw5Zv8Q20=", "narHash": "sha256-9RfAshi6/ou2P2NgiuHNtGGHghzmtpk0Z8uG3CqKa08=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "0c07b30bc7bd15014db7154597b34ca12f60398c", "rev": "5607f78eb46ce192a1fdf2f4f566682e769c7c35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -260,6 +237,25 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1786717298,
"narHash": "sha256-asdPlqtM0AweQ5YNLad6eY4tSYW55YNr1uyayf7mOMQ=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "2dda192987ab6815e44df0130f03d6c907b79134",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1768661221, "lastModified": 1768661221,
@@ -278,11 +274,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1777168982, "lastModified": 1785031560,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -306,22 +302,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1782723713,
"narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1764242076,
@@ -356,11 +336,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1782175435, "lastModified": 1785975029,
"narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", "narHash": "sha256-X44cn5rzytELc3NNoQsh0aLkjWA/QzPfc6HPQmsG3sU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", "rev": "70ce234312134a463ba7728e94da2486a1d237ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -372,27 +352,40 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1782847225, "lastModified": 1767892417,
"narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=", "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
"owner": "nixos", "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"repo": "nixpkgs", "type": "tarball",
"rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd", "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
"type": "github"
}, },
"original": { "original": {
"owner": "nixos", "type": "tarball",
"ref": "nixos-26.05", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1779560665, "lastModified": 1786599213,
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1783776592,
"narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -404,14 +397,14 @@
}, },
"psysonic": { "psysonic": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1782918112, "lastModified": 1786744105,
"narHash": "sha256-cduzx0wvvEuOGqi4dMbiGMIw7I2R0MxKbTQqxnZjrJU=", "narHash": "sha256-dnrB1Qschbx49uE3kaz5coFbv9Zo1AjSnsFzTymuuw0=",
"owner": "Psychotoxical", "owner": "Psychotoxical",
"repo": "psysonic", "repo": "psysonic",
"rev": "114ad4633f816115b640d41bfe7592732741e6df", "rev": "3f423656a111b754cfa7456482003196ea429766",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -428,8 +421,8 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_5", "nixos-hardware": "nixos-hardware",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs": "nixpkgs_6",
"psysonic": "psysonic", "psysonic": "psysonic",
"try-cli": "try-cli", "try-cli": "try-cli",
"voxtype": "voxtype", "voxtype": "voxtype",
@@ -489,11 +482,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770817563, "lastModified": 1786659111,
"narHash": "sha256-REadu3/mf6EHbXofjkYgu/gZ/UBSFOMQ5YhtflwmDNE=", "narHash": "sha256-0uqUVb4B8C94edZSGpmAbpvq8qjuWaV1tyfgP74aK3U=",
"owner": "tobi", "owner": "tobi",
"repo": "try-cli", "repo": "try-cli",
"rev": "f52328af336f7dfa93396069ebcd7152df399010", "rev": "1a0bc444c182aa32c10faef80c7275a93a59519a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -510,11 +503,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782311621, "lastModified": 1786714390,
"narHash": "sha256-K8mog5N+Qv01VyM5n74sOeXCn+2OYgrSZnVDAKQ33zc=", "narHash": "sha256-yocRHGetgqt3SJ/px/ftz3Z6vvAEMSFoa+VhJux/9hs=",
"owner": "peteonrails", "owner": "peteonrails",
"repo": "voxtype", "repo": "voxtype",
"rev": "31b7f38c4e22c4ce75d6350945729e5db001cb9a", "rev": "167c99e4fc92a0c8a5520b1e360be1b82f71d2da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -534,11 +527,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1781164128, "lastModified": 1784217994,
"narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=", "narHash": "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "walker", "repo": "walker",
"rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb", "rev": "42b3ed88abf50bc52638fb2835b7f17e3ea3ac4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+2 -38
View File
@@ -1,30 +1,14 @@
{ {
description = "Stationette nix config"; description = "Stationette nix config";
nixConfig = {
extra-substituters = [
"https://nix-gaming.cachix.org"
"https://walker.cachix.org"
"https://walker-git.cachix.org"
"https://psysonic.cachix.org"
];
extra-trusted-public-keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
"walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
"walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
"psysonic.cachix.org-1:M9cQyQ7tgvUWOQ5Pyt8ozlMoPLtOZir6MfRuTH9/VYA="
];
};
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";
disko.url = "github:nix-community/disko/latest"; disko.url = "github:nix-community/disko/latest";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
firefox-addons = { firefox-addons = {
@@ -61,15 +45,10 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable,
nix-gaming, nix-gaming,
impermanence, impermanence,
disko, disko,
home-manager, home-manager,
try-cli,
psysonic,
voxtype,
walker,
nixos-hardware, nixos-hardware,
# hyprland-preview-share-picker, # hyprland-preview-share-picker,
... ...
@@ -81,10 +60,6 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
nix-gaming = inputs.nix-gaming.packages.${system}; nix-gaming = inputs.nix-gaming.packages.${system};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
mkHost = hostname: nixpkgs.lib.nixosSystem { mkHost = hostname: nixpkgs.lib.nixosSystem {
modules = [ modules = [
@@ -99,11 +74,6 @@
users.chris = import ./home; users.chris = import ./home;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-unstable;
inherit try-cli;
inherit psysonic;
inherit voxtype;
inherit walker;
inherit impermanence; inherit impermanence;
inherit hostname; inherit hostname;
}; };
@@ -112,7 +82,6 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-unstable;
inherit impermanence; inherit impermanence;
inherit disko; inherit disko;
inherit hostname; inherit hostname;
@@ -131,11 +100,6 @@
inherit pkgs; inherit pkgs;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-unstable;
inherit try-cli;
inherit psysonic;
inherit voxtype;
inherit walker;
inherit impermanence; inherit impermanence;
}; };
modules = [ modules = [
home/packages.nix
+9 -10
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, try-cli, psysonic, nix-direnv, ... }: { pkgs, inputs, nix-direnv, ... }:
let let
# krita-appimage = pkgs.callPackage ../packages/krita.nix { }; # krita-appimage = pkgs.callPackage ../packages/krita.nix { };
@@ -24,36 +24,35 @@ in
}; };
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
pkgs-unstable.antigravity # Gemini AI coding assistant antigravity-ide # Gemini AI coding assistant
pkgs-unstable.antigravity-cli # Gemini AI coding assistant antigravity-cli # Gemini AI coding assistant
bluetui # Bluetooth TUI bluetui # Bluetooth TUI
enpass # Password manager enpass # Password manager
enpass-cli # Enpass CLI tool enpass-cli # Enpass CLI tool
expressvpn # VPN expressvpn # VPN
ffmpeg # Video tools ffmpeg # Video tools
ffmpegthumbnailer # Video thumbnailer ffmpegthumbnailer # Video thumbnailer
pkgs-unstable.gemini-cli # Gemini AI CLI tool
ghostty # Terminal emulator ghostty # Terminal emulator
gimp # Image manipulation software gimp # Image manipulation software
gpu-screen-recorder # GPU screen recorder for Linux gpu-screen-recorder # GPU screen recorder for Linux
imv # Image viewer imv # Image viewer
inkscape # Vector graphics software inkscape # Vector graphics software
pkgs-unstable.krita # Custom digital art software (from AppImage) krita # Custom digital art software (from AppImage)
# pkgs-unstable.libation # Audible book manager # libation # Audible book manager
libreoffice-fresh # Office suite libreoffice-fresh # Office suite
pkgs-unstable.atlauncher # Minecraft launcher atlauncher # Minecraft launcher
mpv # Video player mpv # Video player
nautilus # Document viewer nautilus # Document viewer
nextcloud-client # Nextcloud sync client nextcloud-client # Nextcloud sync client
obsidian # Notes software obsidian # Notes software
psysonic.packages.${pkgs.system}.default # Music player inputs.psysonic.packages.${pkgs.system}.default # Music player
signal-desktop # Messaging signal-desktop # Messaging
spotify # Music spotify # Music
super-productivity # Task app super-productivity # Task app
sxiv # Minimal image viewer sxiv # Minimal image viewer
tenacity # Audio software tenacity # Audio software
thunderbird # Mail client thunderbird # Mail client
try-cli.packages.${pkgs.system}.default # Try CLI tool inputs.try-cli.packages.${pkgs.system}.default # Try CLI tool
wally-cli # Keyboard flasher wally-cli # Keyboard flasher
wiremix # Audio mixer TUI wiremix # Audio mixer TUI
xournalpp # Handwriting note-taking software xournalpp # Handwriting note-taking software
@@ -65,7 +64,7 @@ in
force = true; force = true;
text = '' text = ''
{ {
"workspace.library": ["${pkgs-unstable.hyprland}/share/hypr/stubs"] "workspace.library": ["${pkgs.hyprland}/share/hypr/stubs"]
} }
''; '';
}; };
home/programs.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ pkgs, lib, voxtype, walker, ... }: { pkgs, lib, inputs, ... }:
{ {
imports = [ imports = [
walker.homeManagerModules.default inputs.walker.homeManagerModules.default
voxtype.homeManagerModules.default inputs.voxtype.homeManagerModules.default
]; ];
programs = let programs = let
lock-false = { lock-false = {
@@ -33,7 +33,7 @@
}; };
voxtype = { voxtype = {
enable = true; enable = true;
package = voxtype.packages.${pkgs.system}.vulkan; package = inputs.voxtype.packages.${pkgs.system}.vulkan;
service.enable = true; service.enable = true;
settings = {}; settings = {};
}; };
result
-1
View File
@@ -1 +0,0 @@
/nix/store/ldv0r3wrdz10h7q483hym4s5jajnmgs2-psysonic-1.50.0-dev
scratch/psysonic
-1
Submodule scratch/psysonic deleted from e66b674937
system/boot.nix
+3 -1
View File
@@ -56,7 +56,6 @@ in
"systemd.show_status=auto" "systemd.show_status=auto"
"splash" "splash"
]; ];
bootspec.enable = true;
resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root"; resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root";
kernel.sysctl = { kernel.sysctl = {
"net.ipv4.ip_unprivileged_port_start" = 0; "net.ipv4.ip_unprivileged_port_start" = 0;
@@ -69,6 +68,9 @@ in
DefaultTimeoutStopSec = "5s"; DefaultTimeoutStopSec = "5s";
}; };
}; };
services.systemd-suspend.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
services.systemd-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
services.systemd-suspend-then-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
}; };
} }
system/hardware.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs-unstable, ... }: { pkgs, ... }:
{ {
hardware = { hardware = {
@@ -11,7 +11,7 @@
opentabletdriver = { opentabletdriver = {
enable = true; enable = true;
package = pkgs-unstable.opentabletdriver; package = pkgs.opentabletdriver;
}; };
uinput.enable = true; uinput.enable = true;
}; };
system/packages.nix
+6 -5
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, nix-gaming, ... }: { pkgs, nix-gaming, ... }:
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -34,7 +34,7 @@
localsend # Local file sharing tool localsend # Local file sharing tool
makima # Key remapper for Linux TODO: Figure out and configure makima # Key remapper for Linux TODO: Figure out and configure
mako # Notification daemon mako # Notification daemon
pkgs-unstable.neovim # Editor neovim # Editor
nix-gaming.mo2installer nix-gaming.mo2installer
pnpm # JavaScript package manager (used by Neovim plugins) pnpm # JavaScript package manager (used by Neovim plugins)
tree-sitter # Incremental parsing tool for editors tree-sitter # Incremental parsing tool for editors
@@ -42,7 +42,7 @@
openssl # SSL/TLS toolkit openssl # SSL/TLS toolkit
p7zip # 7-Zip archiver p7zip # 7-Zip archiver
pipewire pipewire
pkgs-unstable.yazi # Terminal file manager yazi # Terminal file manager
pywal16 # Image colorscheme generator pywal16 # Image colorscheme generator
qt6.qtwayland # qtwayland support qt6.qtwayland # qtwayland support
ripgrep # Better grep ripgrep # Better grep
@@ -62,8 +62,8 @@
v4l-utils # Video4Linux utilities TODO: Figure out why I need this v4l-utils # Video4Linux utilities TODO: Figure out why I need this
waybar # Status bar for Hyprland waybar # Status bar for Hyprland
wget # Download tool wget # Download tool
pkgs-unstable.wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
pkgs-unstable.winetricks # Windows compatibility tool winetricks # Windows compatibility tool
wl-clipboard # Wayland clipboard manager wl-clipboard # Wayland clipboard manager
wlogout # Wayland logout menu wlogout # Wayland logout menu
xdg-terminal-exec # XDG terminal execution utility xdg-terminal-exec # XDG terminal execution utility
@@ -88,6 +88,7 @@
}; };
nix.settings = { nix.settings = {
trusted-users = [ "root" "chris" ];
extra-substituters = [ extra-substituters = [
"https://nix-gaming.cachix.org" "https://nix-gaming.cachix.org"
"https://walker.cachix.org" "https://walker.cachix.org"
system/programs.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, hostname, ... }: { pkgs, hostname, ... }:
{ {
programs = { programs = {
@@ -13,14 +13,14 @@
}; };
hyprland = { hyprland = {
enable = true; enable = true;
package = pkgs-unstable.hyprland; package = pkgs.hyprland;
portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland;
xwayland.enable = true; xwayland.enable = true;
withUWSM = true; withUWSM = true;
}; };
steam = { steam = {
enable = true; enable = true;
package = pkgs-unstable.steam; package = pkgs.steam;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
system/services.nix
+10 -3
View File
@@ -1,4 +1,4 @@
{ pkgs-unstable, ... }: { pkgs, ... }:
{ {
services = { services = {
@@ -10,7 +10,7 @@
fwupd.enable = true; fwupd.enable = true;
input-remapper = { input-remapper = {
enable = true; enable = true;
package = pkgs-unstable.input-remapper; package = pkgs.input-remapper;
}; };
geoclue2 = { geoclue2 = {
enable = true; enable = true;
@@ -32,7 +32,7 @@
enable = true; enable = true;
wayland.enable = true; wayland.enable = true;
theme = "maya"; theme = "maya";
package = pkgs-unstable.kdePackages.sddm; package = pkgs.kdePackages.sddm;
}; };
autoLogin.enable = true; autoLogin.enable = true;
autoLogin.user = "chris"; autoLogin.user = "chris";
@@ -41,6 +41,13 @@
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
hardware.bolt.enable = true; hardware.bolt.enable = true;
logind = {
enable = true;
settings.Login = {
HandleLidSwitch = "suspend";
HandleLidSwitchDocked = "ignore";
};
};
}; };
security.pam.services.sddm.enableGnomeKeyring = true; security.pam.services.sddm.enableGnomeKeyring = true;
} }
system/virtualisation.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ pkgs-unstable, ... }: { pkgs, ... }:
{ {
virtualisation = { virtualisation = {
docker = { docker = {
enable = true; enable = true;
autoPrune.enable = true; autoPrune.enable = true;
package = pkgs-unstable.docker; package = pkgs.docker;
}; };
}; };
} }