Compare commits

..

No commits in common. "48ce8bdf9d6f9452abad8c50211feb7df1575468" and "7eedb9098a38644464c54fd2b8b0ae9e593e5aa1" have entirely different histories.

16 changed files with 126 additions and 129 deletions

View File

@ -5,7 +5,7 @@ creation_rules:
key_groups: key_groups:
- age: - age:
- *primary - *primary
- path_regex: host/(Rias|Senko|Eclipse)/secrets/.+$ - path_regex: nixos/hosts/(Rias|Senko|Eclipse)/secrets/.+$
key_groups: key_groups:
- age: - age:
- *primary - *primary

164
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1746065248, "lastModified": 1744234873,
"narHash": "sha256-pf0CHOIJTQllsH++29xzQzGaWUIy/976v2wAEADfDaI=", "narHash": "sha256-lQOQNEU1z4/oVBpWDjTXidMdelaafNR3jecj6n0hCIU=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "d44515cc7473e1463a8e619f7a4ac1c1b58580bd", "rev": "8f45b51942618a16e2027a67f054400a32a4b534",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745357003, "lastModified": 1744289235,
"narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1745737601, "lastModified": 1745160082,
"narHash": "sha256-3j6RYmSK1/76HIQNKxLanJIwufce612N/Mc2m9VYz0k=", "narHash": "sha256-p++OMdzk6P4CYkGv2dMuU1mAw0dbuOic2sYkg2/kqwQ=",
"owner": "ayugram-port", "owner": "ayugram-port",
"repo": "ayugram-desktop", "repo": "ayugram-desktop",
"rev": "d6a63088eef3381ed634d793fa7fb6f690cb2111", "rev": "d93e285391c1778dfcbc5e8e2f0cb0353d12fe9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,11 +116,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1745523430, "lastModified": 1732200724,
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +181,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744642301, "lastModified": 1743774811,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746413188, "lastModified": 1745256380,
"narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746369725, "lastModified": 1745198506,
"narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "narHash": "sha256-0hVbHuqAnZUnnGaBTqNes0P0kfH+KKyup2boWDST0iI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "rev": "b0cc092405da805da6fa964f5a178343658ceaf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,11 +444,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745948457, "lastModified": 1742215578,
"narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "ac903e80b33ba6a88df83d02232483d99f327573", "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +473,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745015490, "lastModified": 1743953322,
"narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "60754910946b4e2dc1377b967b7156cb989c5873", "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1746446940, "lastModified": 1745261307,
"narHash": "sha256-RG3NQ1qRbseMFoH/Yzh2Ec53urkEREWelo7GIlHIsoA=", "narHash": "sha256-kBrW9n6DdV7foxrKYk/idV/HlXev+8LoFj3QmidFwFg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "1f50cdfa8be87502c555d29bcfa327fb6bea551d", "rev": "55e953b383f6b658b20ede1fea7772d2a88e7c65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +532,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746293931, "lastModified": 1745156469,
"narHash": "sha256-sy/iPiYNC5HT25S6BxR8CPXcu2g4j5T+5qSHkvMtDq4=", "narHash": "sha256-3PK27C3XcPoOkEIQnaPi3cdvh7XjIGqkcQ6MeZMvy2E=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "fcf1c2ae6f082b90152bede1ec0d0d52d9de2cbf", "rev": "faa4e782753ab994333666b7e686b038d420c22f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,11 +625,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745951494, "lastModified": 1739048983,
"narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -654,11 +654,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745357019, "lastModified": 1744468525,
"narHash": "sha256-q/C3qj9FWHQenObXuw/nGIT8iIsWFjgmcQYcA+ZfpPs=", "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "397600c42b8d7a443a5b4e92aa15f46650a90f18", "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -679,11 +679,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745975815, "lastModified": 1743950287,
"narHash": "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=", "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "05878d9470c9e5cbc8807813f9ec2006627a0ca0", "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +719,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1743315132,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -751,11 +751,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746422338, "lastModified": 1744440957,
"narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +783,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1745526057, "lastModified": 1744932701,
"narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1746141548, "lastModified": 1744932701,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,27 +815,27 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1746328495, "lastModified": 1742071653,
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "narHash": "sha256-BIyMLt0DhN8vSeRPnSxfIJVKL2MYxu/kM14y1mD1s24=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "rev": "30b27177a006d425120fb850a64ceb792636501a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30b27177a006d425120fb850a64ceb792636501a",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1744868846, "lastModified": 1744502386,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -847,11 +847,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1743583204,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,11 +871,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746056780, "lastModified": 1743884191,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167", "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -927,11 +927,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1745310711, "lastModified": 1744669848,
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "rev": "61154300d945f0b147b30d24ddcafa159148026a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -962,11 +962,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1746439475, "lastModified": 1745267573,
"narHash": "sha256-9aFYFeE/Atl9i4rj9NqLLLER0y21F1nIF+ZeJ1Ueml4=", "narHash": "sha256-fSmjCxVoBv76TzAHK/wnJA+F8IWSlWj+FVZAk9r391o=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "6c8b77a7f5c1ff7059c4b6d749ace3b6f083e4bb", "rev": "45aa31f5a4975e6f28596fa3c49997b8a35c78a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1042,11 +1042,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744974599, "lastModified": 1742851696,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1058,11 +1058,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745111349, "lastModified": 1743296873,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1137,11 +1137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745871725, "lastModified": 1744644585,
"narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -20,7 +20,7 @@
inputs = { inputs = {
aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.url = "github:ezKEa/aagl-gtk-on-nix";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/30b27177a006d425120fb850a64ceb792636501a";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-fixed.url = "github:nixos/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d"; nixpkgs-fixed.url = "github:nixos/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@ -44,9 +44,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
nixosConfigurations = { nixosConfigurations = {
Rias = nixpkgs-stable.lib.nixosSystem { Rias = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-unstable = import nixpkgs { pkgs-stable = import nixpkgs-stable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -59,9 +59,9 @@
modules = [ ./host/Rias/configuration.nix ]; modules = [ ./host/Rias/configuration.nix ];
}; };
Senko = nixpkgs-stable.lib.nixosSystem { Senko = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-unstable = import nixpkgs { pkgs-stable = import nixpkgs-stable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -74,9 +74,9 @@
modules = [ ./host/Senko/configuration.nix ]; modules = [ ./host/Senko/configuration.nix ];
}; };
Eclipse = nixpkgs-stable.lib.nixosSystem { Eclipse = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-unstable = import nixpkgs { pkgs-stable = import nixpkgs-stable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -89,9 +89,9 @@
modules = [ ./host/Eclipse/configuration.nix ]; modules = [ ./host/Eclipse/configuration.nix ];
}; };
Impreza = nixpkgs-stable.lib.nixosSystem { Impreza = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-unstable = import nixpkgs { pkgs-stable = import nixpkgs-stable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let
laptop = false; laptop = false;
in { in {
imports = [ imports = [
@ -17,7 +17,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let
laptop = true; laptop = true;
in { in {
imports = [ imports = [
@ -15,7 +15,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let
laptop = false; laptop = false;
in { in {
imports = [ imports = [
@ -17,7 +17,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let
laptop = true; laptop = true;
in { in {
imports = [ imports = [
@ -15,7 +15,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -16,7 +16,7 @@
}; };
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.beta;
prime = lib.optionalAttrs config.host.laptop { prime = lib.optionalAttrs config.host.laptop {
intelBusId = "PCI:0:2:0"; intelBusId = "PCI:0:2:0";

View File

@ -1,7 +1,7 @@
{ pkgs-unstable, inputs, ... }: { { pkgs, inputs, ... }: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs-unstable; [ environment.systemPackages = with pkgs; [
file file
tree tree
wget wget
@ -20,7 +20,7 @@
fonts = { fonts = {
enableDefaultPackages = false; enableDefaultPackages = false;
packages = with pkgs-unstable; [ packages = with pkgs; [
jetbrains-mono # Best mono font jetbrains-mono # Best mono font
noto-fonts-cjk-sans # Japanese noto-fonts-cjk-sans # Japanese
powerline-symbols # Console decoration powerline-symbols # Console decoration

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, lib, ... }: { config, pkgs, pkgs-stable, lib, ... }:
lib.mkIf config.programs.gamemode.enable { lib.mkIf config.programs.gamemode.enable {
programs.steam = { programs.steam = {
@ -6,12 +6,12 @@ lib.mkIf config.programs.gamemode.enable {
gamescopeSession.enable = true; gamescopeSession.enable = true;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs-stable; [
mangohud mangohud
protonup protonup
bottles pkgs.bottles
heroic heroic
prismlauncher pkgs.prismlauncher
]; ];
environment.sessionVariables = { environment.sessionVariables = {

View File

@ -1,8 +1,8 @@
{ {
security.rtkit.enable = true; security.rtkit.enable = true;
hardware.pulseaudio.enable = false;
services = { services = {
pulseaudio.enable = false;
pipewire = { pipewire = {
enable = true; enable = true;

View File

@ -1,11 +1,11 @@
{ pkgs, pkgs-unstable, config, ...}: { {pkgs, config, ...}: {
systemd.services.v2raya = { systemd.services.v2raya = {
enable = true; enable = true;
description = "v2rayA gui client"; description = "v2rayA gui client";
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
Restart = "always"; Restart = "always";
ExecStart = "${pkgs-unstable.v2raya}/bin/v2rayA"; ExecStart = "${pkgs.v2raya}/bin/v2rayA";
}; };
path = with pkgs; [ iptables bash iproute2 ]; path = with pkgs; [ iptables bash iproute2 ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -19,8 +19,8 @@
environment.etc = { environment.etc = {
"v2raya/ru_geoip.dat".source = pkgs.fetchurl { "v2raya/ru_geoip.dat".source = pkgs.fetchurl {
name = "geoip.dat"; name = "geoip.dat";
url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202505050926/geoip.dat"; url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202503301521/geoip.dat";
hash = "sha256-vn7cZigqaHY8ncmWJXik8K7ri6JvEoma4sCp6mG3N0U="; hash = "sha256-IhMK8IzAYo1RtTFCPKaJ515JtZHv08UXDssg3fPgh+I=";
}; };
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path; "v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;

View File

@ -2,14 +2,14 @@
yazi-plugins = pkgs.fetchFromGitHub { yazi-plugins = pkgs.fetchFromGitHub {
owner = "yazi-rs"; owner = "yazi-rs";
repo = "plugins"; repo = "plugins";
rev = "864a0210d9ba1e8eb925160c2e2a25342031d8d3"; rev = "273019910c1111a388dd20e057606016f4bd0d17";
hash = "sha256-m3709h7/AHJAtoJ3ebDA40c77D+5dCycpecprjVqj/k="; hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I=";
}; };
starship = pkgs.fetchFromGitHub { starship = pkgs.fetchFromGitHub {
owner = "Rolv-Apneseth"; owner = "Rolv-Apneseth";
repo = "starship.yazi"; repo = "starship.yazi";
rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6"; rev = "6c639b474aabb17f5fecce18a4c97bf90b016512";
sha256 = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY="; sha256 = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A=";
}; };
in { in {
programs.yazi = { programs.yazi = {

View File

@ -75,7 +75,7 @@
initExtra = '' initExtra = ''
eval "$(zoxide init zsh)" eval "$(zoxide init zsh)"
eval "$(nh completions zsh)" eval "$(nh completions --shell zsh)"
source "$(fzf-share)/key-bindings.zsh" source "$(fzf-share)/key-bindings.zsh"
source "$(fzf-share)/completion.zsh" source "$(fzf-share)/completion.zsh"
''; '';

View File

@ -1,8 +1,8 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, laptop, name, fullname ? name, ... }: { { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, laptop, name, fullname ? name, ... }: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
useGlobalPkgs = false; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
backupFileExtension = "rebuild"; backupFileExtension = "rebuild";
@ -22,13 +22,10 @@
homeDirectory = "/home/${name}"; homeDirectory = "/home/${name}";
stateVersion = "23.11"; stateVersion = "23.11";
}; };
_module.args.pkgs = lib.mkForce pkgs-unstable;
}; };
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
pkgs-stable = pkgs; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-fixed;
host = { host = {
laptop = laptop; laptop = laptop;