summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2024-11-30 21:05:09 -0500
committerGitHub <[email protected]>2024-11-30 21:05:09 -0500
commit176954a1bfaa509a7d6712a5aa01874a0a6d0f79 (patch)
tree1f8918cc0bee91cb6ebebdce28fab3a353872af4
parentae347ed01055ff574f05cf1d3423e77f0da9a249 (diff)
flake: bump nixpkgs-stable to 24.11 (#512)
• Updated input 'catppuccin': 'github:catppuccin/nix/32359bf226fe874d3b7a0a5753d291a4da9616fe?narHash=sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa%2BEPlDEs%3D' (2024-11-10) → 'github:catppuccin/nix/a817009ebfd2cca7f70a77884e5098d0a8c83f8e?narHash=sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk%3D' (2024-11-30) • Updated input 'getchvim': 'github:getchoo/getchvim/43065f7112479eea94b7e74577b3e1ae30b1ddcc?narHash=sha256-IkVRFc%2Bd3MGetYbsnuh8HxTLLRtPU9fFOsRa83/ox7s%3D' (2024-11-23) → 'github:getchoo/getchvim/a04437242fdd96c927a55b19c977134ffdee1b16?narHash=sha256-f9N/QB9Y5847GGstdAtnLUGHqOthRG7sMH0U%2Bs7HEIQ%3D' (2024-11-30) • Updated input 'home-manager': 'github:nix-community/home-manager/8cf9cb2ee78aa129e5b8220135a511a2be254c0c?narHash=sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg%2BFBQDsyAilu637g%3D' (2024-11-22) → 'github:nix-community/home-manager/819f682269f4e002884702b87e445c82840c68f2?narHash=sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB%2BXG6Q%3D' (2024-11-29) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a?narHash=sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY%3D' (2024-11-23) → 'github:LnL7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a?narHash=sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8%3D' (2024-11-26) • Updated input 'nix-exprs': 'github:getchoo/nix-exprs/70b0b3f1cdffc74e52b89ae33c5a0d295421f87e?narHash=sha256-JrIhoypjuFEogVUnWPTkBLU/zzH33JzMWiTFzVw0syk%3D' (2024-11-16) → 'github:getchoo/nix-exprs/f8287e35382e3ad0d933b7d858b0cec716065b1e?narHash=sha256-l6nqLm2gVE/oepJIwHwQDyMvAmC9TZwEwJcnz6%2BhW9s%3D' (2024-11-30) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/bdba246946fb079b87b4cada4df9b1cdf1c06132?narHash=sha256-l9ryrx1Twh08a%2BgxrMGM9O/aZKEimZfa6sZVyPCImgI%3D' (2024-11-17) → 'github:nix-community/nix-index-database/f4a5ca5771ba9ca31ad24a62c8d511a405303436?narHash=sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q%3D' (2024-11-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25) → 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/0c5b4ecbed5b155b705336aa96d878e55acd8685?narHash=sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs%2BCSkg31C9Y%3D' (2024-11-27) → 'github:NixOS/nixpkgs/c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9?narHash=sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ%2BCtTRyY%3D' (2024-11-28) • Updated input 'openwrt-imagebuilder': 'github:astro/nix-openwrt-imagebuilder/263cf879ef474ccd8154e412981d20ee4ff7970e?narHash=sha256-h65AvViCirnj7/OqKPqEyVH%2BcKslaxEsxSBov3kkmiY%3D' (2024-11-22) → 'github:astro/nix-openwrt-imagebuilder/4c2c0c97b7b17e7f5d33691aa40eb7bb0f94d1d5?narHash=sha256-4wG1tYpSX59eTTS63BQ4VqLxh5eWSjYidAfJsXo3FeU%3D' (2024-12-01) • Added input 'openwrt-imagebuilder/flake-parts': follows 'lanzaboote/flake-parts' • Added input 'openwrt-imagebuilder/systems': follows 'nixos-wsl/flake-utils/systems'
-rw-r--r--flake.lock65
-rw-r--r--flake.nix10
-rw-r--r--modules/darwin/desktop/fonts.nix2
-rw-r--r--modules/nixos/desktop/fonts.nix11
-rw-r--r--modules/nixos/desktop/niri/default.nix94
-rw-r--r--modules/nixos/traits/24.05-compat.nix19
-rw-r--r--modules/nixos/traits/default.nix2
-rw-r--r--modules/nixos/traits/nvidia.nix2
8 files changed, 86 insertions, 119 deletions
diff --git a/flake.lock b/flake.lock
index 98eddbe..ca15bea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,11 +55,11 @@
},
"catppuccin": {
"locked": {
- "lastModified": 1731232837,
- "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
+ "lastModified": 1733001911,
+ "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
+ "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e",
"type": "github"
},
"original": {
@@ -156,11 +156,11 @@
]
},
"locked": {
- "lastModified": 1732395007,
- "narHash": "sha256-IkVRFc+d3MGetYbsnuh8HxTLLRtPU9fFOsRa83/ox7s=",
+ "lastModified": 1732929608,
+ "narHash": "sha256-f9N/QB9Y5847GGstdAtnLUGHqOthRG7sMH0U+s7HEIQ=",
"owner": "getchoo",
"repo": "getchvim",
- "rev": "43065f7112479eea94b7e74577b3e1ae30b1ddcc",
+ "rev": "a04437242fdd96c927a55b19c977134ffdee1b16",
"type": "github"
},
"original": {
@@ -176,11 +176,11 @@
]
},
"locked": {
- "lastModified": 1732303962,
- "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=",
+ "lastModified": 1732884235,
+ "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c",
+ "rev": "819f682269f4e002884702b87e445c82840c68f2",
"type": "github"
},
"original": {
@@ -241,11 +241,11 @@
]
},
"locked": {
- "lastModified": 1732324260,
- "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=",
+ "lastModified": 1732603785,
+ "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a",
+ "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
]
},
"locked": {
- "lastModified": 1731724695,
- "narHash": "sha256-JrIhoypjuFEogVUnWPTkBLU/zzH33JzMWiTFzVw0syk=",
+ "lastModified": 1732928504,
+ "narHash": "sha256-l6nqLm2gVE/oepJIwHwQDyMvAmC9TZwEwJcnz6+hW9s=",
"owner": "getchoo",
"repo": "nix-exprs",
- "rev": "70b0b3f1cdffc74e52b89ae33c5a0d295421f87e",
+ "rev": "f8287e35382e3ad0d933b7d858b0cec716065b1e",
"type": "github"
},
"original": {
@@ -296,11 +296,11 @@
]
},
"locked": {
- "lastModified": 1731814505,
- "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
+ "lastModified": 1732519917,
+ "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
+ "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
"type": "github"
},
"original": {
@@ -333,11 +333,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1732521221,
- "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+ "lastModified": 1732837521,
+ "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+ "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github"
},
"original": {
@@ -349,16 +349,16 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1732749044,
- "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+ "lastModified": 1732824227,
+ "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+ "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -390,16 +390,25 @@
},
"openwrt-imagebuilder": {
"inputs": {
+ "flake-parts": [
+ "lanzaboote",
+ "flake-parts"
+ ],
"nixpkgs": [
"nixpkgs"
+ ],
+ "systems": [
+ "nixos-wsl",
+ "flake-utils",
+ "systems"
]
},
"locked": {
- "lastModified": 1732266692,
- "narHash": "sha256-h65AvViCirnj7/OqKPqEyVH+cKslaxEsxSBov3kkmiY=",
+ "lastModified": 1733016213,
+ "narHash": "sha256-4wG1tYpSX59eTTS63BQ4VqLxh5eWSjYidAfJsXo3FeU=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
- "rev": "263cf879ef474ccd8154e412981d20ee4ff7970e",
+ "rev": "4c2c0c97b7b17e7f5d33691aa40eb7bb0f94d1d5",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 03db398..4ff0f9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,7 +116,7 @@
nixfmt = mkCheck {
name = "check-nixfmt";
deps = [ pkgs.nixfmt-rfc-style ];
- script = "nixfmt --check ${self}";
+ script = "nixfmt --check ${self}/**/*.nix";
};
statix = mkCheck {
@@ -271,7 +271,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
+ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nix-darwin = {
url = "github:LnL7/nix-darwin";
@@ -361,7 +361,11 @@
openwrt-imagebuilder = {
url = "github:astro/nix-openwrt-imagebuilder";
- inputs.nixpkgs.follows = "nixpkgs";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ flake-parts.follows = "lanzaboote/flake-parts";
+ systems.follows = "nixos-wsl/flake-utils/systems";
+ };
};
teawiebot = {
diff --git a/modules/darwin/desktop/fonts.nix b/modules/darwin/desktop/fonts.nix
index 790f4ba..b4d4ca3 100644
--- a/modules/darwin/desktop/fonts.nix
+++ b/modules/darwin/desktop/fonts.nix
@@ -15,6 +15,6 @@ in
};
config = lib.mkIf cfg.enable {
- fonts.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
+ fonts.packages = [ pkgs.nerd-fonts.fira-code ];
};
}
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index 9b634ea..8ca4cae 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -20,16 +20,13 @@ in
enableDefaultPackages = true;
packages = with pkgs; [
- (nerdfonts.override {
- fonts = [
- "FiraCode"
- "Hack"
- "Noto"
- ];
- })
noto-fonts
noto-fonts-color-emoji
noto-fonts-cjk-sans
+
+ nerd-fonts.fira-code
+ nerd-fonts.hack
+ nerd-fonts.noto
];
fontconfig = {
diff --git a/modules/nixos/desktop/niri/default.nix b/modules/nixos/desktop/niri/default.nix
index 019e2a8..93505ee 100644
--- a/modules/nixos/desktop/niri/default.nix
+++ b/modules/nixos/desktop/niri/default.nix
@@ -6,70 +6,48 @@
}:
let
cfg = config.desktop.niri;
-
- inherit (lib) version;
- minVersion = "24.11";
- hasNiri = lib.versionAtLeast version minVersion;
in
{
options.desktop.niri = {
enable = lib.mkEnableOption "Niri desktop settings";
};
- config = lib.mkIf cfg.enable (
- lib.mkMerge [
- {
- environment = {
- sessionVariables = {
- NIXOS_OZONE_WL = "1"; # Niri doesn't have native XWayland support
- };
-
- systemPackages = with pkgs; [
- # Terminal
- alacritty
- # Media player
- celluloid
- # PDF viewer
- evince
- # Application runner
- fuzzel
- # Image viewer
- loupe
- # Notification daemon
- mako
- # Polkit agent
- pantheon.pantheon-agent-polkit
- # Screen locker
- swaylock
- # Trash manager
- trashy
- ];
- };
+ config = lib.mkIf cfg.enable {
+ environment = {
+ sessionVariables = {
+ NIXOS_OZONE_WL = "1"; # Niri doesn't have native XWayland support
+ };
- services.greetd = {
- enable = true;
- settings = {
- default_session.command = toString [
- (lib.getExe pkgs.greetd.tuigreet)
- "--time"
- ];
- };
- };
- }
+ systemPackages = with pkgs; [
+ # Terminal
+ alacritty
+ # Media player
+ celluloid
+ # PDF viewer
+ evince
+ # Application runner
+ fuzzel
+ # Image viewer
+ loupe
+ # Notification daemon
+ mako
+ # Polkit agent
+ pantheon.pantheon-agent-polkit
+ # Screen locker
+ swaylock
+ # Trash manager
+ trashy
+ ];
+ };
- # TODO: Remove when 24.11 becomes stable
- (
- if hasNiri then
- {
- programs.niri.enable = true;
- }
- else
- {
- warnings = [
- "You have enabled Niri when it is not available on NixOS ${version}. Please upgrade to at least NixOS ${minVersion}"
- ];
- }
- )
- ]
- );
+ services.greetd = {
+ enable = true;
+ settings = {
+ default_session.command = toString [
+ (lib.getExe pkgs.greetd.tuigreet)
+ "--time"
+ ];
+ };
+ };
+ };
}
diff --git a/modules/nixos/traits/24.05-compat.nix b/modules/nixos/traits/24.05-compat.nix
deleted file mode 100644
index d275f9c..0000000
--- a/modules/nixos/traits/24.05-compat.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# collection of fun workarounds for the stable branch of nixos
-{ lib, ... }:
-{
- imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
- # https://github.com/NixOS/nixpkgs/pull/320228
- (lib.mkAliasOptionModule
- [
- "hardware"
- "graphics"
- "extraPackages"
- ]
- [
- "hardware"
- "opengl"
- "extraPackages"
- ]
- )
- ];
-}
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index 119b527..a7357ee 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -1,7 +1,5 @@
{
imports = [
- ./24.05-compat.nix # TODO: remove when 24.11 is stable
-
./arm-builder.nix
./auto-upgrade.nix
./containers.nix
diff --git a/modules/nixos/traits/nvidia.nix b/modules/nixos/traits/nvidia.nix
index 6e6fdb5..2ab0f5b 100644
--- a/modules/nixos/traits/nvidia.nix
+++ b/modules/nixos/traits/nvidia.nix
@@ -32,7 +32,7 @@ in
boot = {
# required for GSP firmware
kernelParams = [ "nouveau.config=NvGspRm=1" ];
- # we want early KMS
+ # we want early KMS
# https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
initrd.kernelModules = [ "nouveau" ];
};