Daholli/nixos-config
1
0
Fork 0
Code Issues 3 Pull requests 1 Releases Packages Activity Actions

Compare commits

base: Daholli:06c1065ee9fd138b6253cca5be73fa537f8a85f4
Branches Tags
Daholli:main
Daholli:main-merge
Daholli:rewrite
..
compare: Daholli:216812be22a34412607a3c3c66ec60b6791fb840
Branches Tags
Daholli:main-merge
Daholli:rewrite
Daholli:main

No commits in common. "06c1065ee9fd138b6253cca5be73fa537f8a85f4" and "216812be22a34412607a3c3c66ec60b6791fb840" have entirely different histories.
06c1065ee9 ... 216812be22

8 changed files with 136 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

262
flake.lock generated
View file

@ -134,11 +134,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1737873155,
"narHash": "sha256-6g9lSb6Vq/NnXdqKSSzQ09Wd2kK/mWIvv3ZrVhLYUOg=",
"lastModified": 1737700483,
"narHash": "sha256-1778bR4GDDc51/iZQvcshGLZ4JU87zCzqei8Hn7vU1A=",
"owner": "nix-community",
"repo": "fenix",
"rev": "11391594600c119f02b3ee864decca1d6767f1b6",
"rev": "bab2a2840bc2d5ae7c6a133602185edbe4ca7daa",
"type": "github"
},
"original": {
@ -335,7 +335,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_5"
"systems": "systems_6"
},
"locked": {
"lastModified": 1694529238,
@ -399,11 +399,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1737868873,
"narHash": "sha256-kZe1ME1ZI4tDw4+mFxlet8dxGdp5GN67Y167fqSqcbs=",
"lastModified": 1737677675,
"narHash": "sha256-a6VO9JFCif+4ipdszBcQO772QLmBtj9Ai5iAgi/4+/U=",
"owner": "helix-editor",
"repo": "helix",
"rev": "aac0ce5fd13df7f275b6523da58dec1ec054a8c8",
"rev": "a63a2ad281b5f651effd29efa4e34f504507d0da",
"type": "github"
},
"original": {
@ -419,11 +419,11 @@
]
},
"locked": {
"lastModified": 1737762889,
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"lastModified": 1737704314,
"narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7",
"type": "github"
},
"original": {
@ -548,19 +548,19 @@
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2",
"systems": "systems_3",
"xdph": "xdph"
},
"locked": {
"lastModified": 1737896452,
"narHash": "sha256-ODynzEy3QDWH+ubUsNC1eAhHj8U84c7Hew7k12cAJEI=",
"lastModified": 1737679787,
"narHash": "sha256-fW7Mvd5/SYZbPry3fh/llFH8QfIb7ZbXTJGQpLvS04c=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "4abf9155ee67ee09116948b1d9efef58c08697d9",
"rev": "4a1b960cbedb3e2893eeadecdf2b4a7314634306",
"type": "github"
},
"original": {
@ -669,11 +669,11 @@
]
},
"locked": {
"lastModified": 1737811848,
"narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=",
"lastModified": 1737634810,
"narHash": "sha256-ZIJ03DeisbQuDaADSgmbgyocjecaozK4yGTa0/9bOr0=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b",
"rev": "a9852dbf5a1ec77cf617543728144c1362709e46",
"type": "github"
},
"original": {
@ -684,19 +684,13 @@
},
"hyprlang": {
"inputs": {
"hyprutils": "hyprutils",
"nixpkgs": [
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"nixpkgs"
"hyprutils"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"systems"
]
"nixpkgs": "nixpkgs_2",
"systems": "systems_2"
},
"locked": {
"lastModified": 1737634606,
@ -774,17 +768,17 @@
"inputs": {
"hyprgraphics": "hyprgraphics_2",
"hyprlang": "hyprlang_3",
"hyprutils": "hyprutils_3",
"hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner_2",
"nixpkgs": "nixpkgs_3",
"systems": "systems_3"
"nixpkgs": "nixpkgs_4",
"systems": "systems_4"
},
"locked": {
"lastModified": 1737837801,
"narHash": "sha256-i7nKSo/FGU5Sjq2xM+UFahZHqqrjZn5WUekOZFsjO2w=",
"lastModified": 1737635493,
"narHash": "sha256-4hUhIyLyxNjRc7cuGDojEGHvAgtoP4/82qOpENTEAfs=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "e77bc92b99e06ee66ccd684afbfe3a743af1f01d",
"rev": "742eb98c6a7082eb7bbaa609502f19f8b2035592",
"type": "github"
},
"original": {
@ -796,14 +790,14 @@
"hyprpanel": {
"inputs": {
"ags": "ags",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1737793455,
"narHash": "sha256-sVy0QU4fpZsUWj5B8t6jUNZHzVLC22+HYqcFG9pKPik=",
"lastModified": 1737350675,
"narHash": "sha256-Zy2PidkAOYDvnFgZO+QFDYywQAPtA/xi7SuZLVd+ZyM=",
"owner": "Jas-SinghFSU",
"repo": "HyprPanel",
"rev": "74065af3d2aa576e8b183d720033c3eece3deb70",
"rev": "562eb64e12047cb3a4ef5db2e9df19f9a726ae7c",
"type": "github"
},
"original": {
@ -816,16 +810,10 @@
"inputs": {
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"systems"
]
},
@ -844,31 +832,6 @@
}
},
"hyprutils_2": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1737725508,
"narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_3": {
"inputs": {
"nixpkgs": [
"hyprlock",
@ -980,15 +943,15 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"umu": "umu"
},
"locked": {
"lastModified": 1737855374,
"narHash": "sha256-RRGX2C+c+GaR3YMiYm6l/Tp5N/KZtYpiTplUrBwH/og=",
"lastModified": 1737596278,
"narHash": "sha256-OEdGZ6TTHXGB791VvhErq4Nro54NQzzDAO0G0WfK2kw=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "4845fe94cda365c7550d9fd1ef899d45df0bc18a",
"rev": "10f37dc9be5d79fec72b46b670ece4783a83a13a",
"type": "github"
},
"original": {
@ -1019,11 +982,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1737751639,
"narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
"lastModified": 1737590910,
"narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
"rev": "9368027715d8dde4b84c79c374948b5306fdd2db",
"type": "github"
},
"original": {
@ -1114,11 +1077,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1737897534,
"narHash": "sha256-0CbrdmdFH1hMHyKUIfMXAMmqF78wfnbvL0VMTXyz8VY=",
"lastModified": 1737718686,
"narHash": "sha256-UP9jw+MUINLBMcC09hr9xf+05jsRnTOvLRyOKis8giI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cf577e430899f96e0214a9d83f8f6905922611dd",
"rev": "defe5870670e9fe4d0a8a04e0e58ec60c7745bb1",
"type": "github"
},
"original": {
@ -1130,11 +1093,27 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1737746512,
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1735471104,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github"
},
"original": {
@ -1146,11 +1125,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"type": "github"
},
"original": {
@ -1177,6 +1156,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
@ -1192,13 +1187,13 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1737717945,
"narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
"lastModified": 1737003892,
"narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ecd26a469ac56357fd333946a99086e992452b6a",
"rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713",
"type": "github"
},
"original": {
@ -1208,13 +1203,13 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1737746512,
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github"
},
"original": {
@ -1224,7 +1219,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@ -1239,7 +1234,7 @@
"type": "indirect"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1731763621,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
@ -1255,22 +1250,6 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1735471104,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@ -1340,7 +1319,7 @@
"nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"nixpkgs-latest-factorio": "nixpkgs-latest-factorio",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable",
@ -1406,11 +1385,11 @@
"rpi-linux-6_10_12-src": {
"flake": false,
"locked": {
"lastModified": 1728980267,
"narHash": "sha256-jCmFC40n6fP0YaTTn3pWz9sz1GxXuXw6cUTlXssCb9I=",
"lastModified": 1728305462,
"narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "6e23f4f785081a7c68e94a8e38a49074097299f9",
"rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f",
"type": "github"
},
"original": {
@ -1423,11 +1402,11 @@
"rpi-linux-6_6_67-src": {
"flake": false,
"locked": {
"lastModified": 1737738344,
"narHash": "sha256-kj16wXihASnuFg6z45U3tT1AjDDklYpCJVb/s5YkcSo=",
"lastModified": 1734790986,
"narHash": "sha256-q9swM2TmmuzbUuQnbLZk5PseKWD7/SNPwtth6bpGIqE=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "6d16e47ca139ba64c5daedf06e72f2774adbdc48",
"rev": "811ff707533bcd67cdcd368bbd46223082009b12",
"type": "github"
},
"original": {
@ -1474,11 +1453,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1737831834,
"narHash": "sha256-Nd8Qd8kWrJSAaPD/VGVm98ntCIJ4d9ZkfDSySWM0bbU=",
"lastModified": 1737634189,
"narHash": "sha256-AG5G9KDsl0Ngby9EfWvlemma7WWG0KCADTIccPJuzUE=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "90bf50c0112db1494233401b6c0f895fb3210ddd",
"rev": "84d44d0a574630aa8500ed62b6c01ccd3fae2473",
"type": "github"
},
"original": {
@ -1513,7 +1492,7 @@
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_8",
"nixpkgs-24_05": "nixpkgs-24_05",
"utils": "utils"
},
@ -1602,7 +1581,7 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1737411508,
@ -1664,6 +1643,21 @@
}
},
"systems_4": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1678,7 +1672,7 @@
"type": "github"
}
},
"systems_5": {
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1715,11 +1709,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1737834175,
"narHash": "sha256-uHTE0PWZ9A/uLCAlx36z3pdDfIEdu5Jsnt4bJW4KYLY=",
"lastModified": 1737484151,
"narHash": "sha256-pONHsVIyIHbjyv51JQW3Nv9JeuqiVEuINyH+HnN4f8Q=",
"ref": "refs/heads/main",
"rev": "4d1860eefd79d6c04e964774155dbe13be65121a",
"revCount": 911,
"rev": "0cac244cc89ee69bf33ad60a3953cfde188ee8a6",
"revCount": 907,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
@ -1733,7 +1727,7 @@
},
"utils": {
"inputs": {
"systems": "systems_4"
"systems": "systems_5"
},
"locked": {
"lastModified": 1709126324,
@ -1792,14 +1786,14 @@
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1737869730,
"narHash": "sha256-4u/VS7fiqAtnEnm2z7DSNzNyM7sUB+nq3aGKcKBwodg=",
"lastModified": 1737688749,
"narHash": "sha256-c67wGumgDSYe6T6OJOKP15H2ODxItUXXekQqDSPjEa0=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "39c4c603ee641aed350dce31562ad6dd6f0044d8",
"rev": "44a3c15f50dba8073feca64ec500daa44d9f366d",
"type": "github"
},
"original": {

6
modules/nixos/apps/_1password/default.nix
View file

@ -25,11 +25,5 @@ in
polkitPolicyOwners = [ config.${namespace}.user.name ];
};
};
${namespace}.home.file.".ssh/config".text = ''
Host *
ForwardAgent yes
IdentityAgent ~/.1password/agent.sock
'';
};
}

3
modules/nixos/apps/cli-apps/helix/default.nix
View file

@ -36,10 +36,9 @@ in
${namespace} = {
home.extraOptions = {
home.file.".config/helix/ignore".text = ''
# unignore in file picker and global search
.idea/
!**/appsettings.json
.direnv/
.devenv/
'';
catppuccin.helix.enable = true;

2
modules/nixos/apps/discord/default.nix
View file

@ -18,7 +18,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
discord
vesktop
];
};
}

2
modules/nixos/desktop/hyprland/default.nix
View file

@ -172,7 +172,7 @@ in
"systemctl --user start hyprpolkitagent"
"[workspace 2 silent] steam --disable-gpu-compositing" # nvidia pls let me have nice things
"[workspace 8 silent] discord"
"[workspace 8 silent] vesktop"
"[workspace 9 silent] 1password"
"[workspace 1 silent] zen"

2
modules/nixos/system/boot/default.nix
View file

@ -17,7 +17,7 @@ in
config = mkIf cfg.enable {
boot = {
kernelPackages = pkgs.linuxPackages_6_12;
kernelPackages = pkgs.linuxPackages_latest;
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;

2
modules/nixos/system/hardware/gpu/nvidia/default.nix
View file

@ -28,7 +28,7 @@ in
powerManagement.enable = true;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.latest; # stable, beta
package = config.boot.kernelPackages.nvidiaPackages.beta; # stable, beta
};
services.xserver.videoDrivers = [ "nvidia" ];

3
overlays/pyfa/default.nix Normal file
View file

@ -0,0 +1,3 @@
{ channels, ... }:
final: prev: { inherit (channels.nixpkgs-pyfa) pyfa; }