feat: migrate nixos to 24.05 (#77)

zakuciael · May 31, 2024 · 949a90e · 949a90e
1 parent 5f3f5b2
commit 949a90e
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 134 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -28,6 +28,7 @@
     ],
     "cSpell.words": [
         "ahci",
+        "alacritty",
         "bootloader",
         "bootmgfw",
         "catppuccin",
@@ -37,6 +38,7 @@
         "Filesystems",
         "flatpak",
         "Hyprland",
+        "hyprpaper",
         "insmod",
         "jetbrains",
         "menuentry",
@@ -51,13 +53,15 @@
         "pkgs",
         "polkit",
         "Redistributable",
+        "stylix",
         "substituters",
         "swraid",
         "thalheim",
         "togglable",
         "usbhid",
         "vfat",
         "xhci",
+        "xorg",
         "zoxide"
     ],
     "conventionalCommits.scopes": [

diff --git a/configuration.nix b/configuration.nix
@@ -54,7 +54,7 @@
   };
 
   console.keyMap = "pl";
-  services.xserver.layout = "pl";
+  services.xserver.xkb.layout = "pl";
 
   # Fonts
   fonts.packages = with pkgs; [
@@ -121,7 +121,7 @@
     useGlobalPkgs = true;
     users.${username}.home = {
       inherit username;
-      stateVersion = "23.11";
+      stateVersion = "24.05";
       homeDirectory = "/home/${username}";
       packages = scripts.mkShellExports config;
     };
@@ -147,5 +147,5 @@
   };
 
   # System
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "A Super-Duper Invincible Shining Sparkly Magic NixOS Config"; # Credits: Genshin Impact
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     nix-colors.url = "github:misterio77/nix-colors";
@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     distro-grub-themes = {
@@ -52,7 +52,7 @@
     };
     nil = {
       url = "github:oxalica/nil";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
   };

diff --git a/lib/hosts.nix b/lib/hosts.nix
@@ -23,9 +23,6 @@ with lib.my; {
           ./../configuration.nix
           ./../hosts/${name}/configuration.nix
 
-          # TODO: Remove this when nixos 24.05 releases
-          "${unstable.path}/nixos/modules/programs/nh.nix"
-
           inputs.home-manager.nixosModules.default
           inputs.sops-nix.nixosModules.default
           inputs.stylix.nixosModules.default

diff --git a/lib/mapper.nix b/lib/mapper.nix
@@ -39,71 +39,6 @@ with lib; rec {
 
   toTOML = name: attrs: (pkgs.formats.toml {}).generate name attrs;
 
-  # TODO: Replace with `lib.hm.generators.toHyprconf` when nix-community/home-manager#5324 lands in a stable release
-  toHyprconf = {
-    attrs,
-    indentLevel ? 0,
-    importantPrefixes ? ["$"],
-  }: let
-    inherit
-      (lib)
-      all
-      concatMapStringsSep
-      concatStrings
-      concatStringsSep
-      filterAttrs
-      foldl
-      generators
-      hasPrefix
-      isAttrs
-      isList
-      mapAttrsToList
-      replicate
-      ;
-
-    initialIndent = concatStrings (replicate indentLevel "  ");
-
-    toHyprconf' = indent: attrs: let
-      sections =
-        filterAttrs (n: v: isAttrs v || (isList v && all isAttrs v)) attrs;
-
-      mkSection = n: attrs:
-        if lib.isList attrs
-        then (concatMapStringsSep "\n" (a: mkSection n a) attrs)
-        else ''
-          ${indent}${n} {
-          ${toHyprconf' "  ${indent}" attrs}${indent}}
-        '';
-
-      mkFields = generators.toKeyValue {
-        listsAsDuplicateKeys = true;
-        inherit indent;
-      };
-
-      allFields =
-        filterAttrs (n: v: !(isAttrs v || (isList v && all isAttrs v)))
-        attrs;
-
-      isImportantField = n: _:
-        foldl (acc: prev:
-          if hasPrefix prev n
-          then true
-          else acc)
-        false
-        importantPrefixes;
-
-      importantFields = filterAttrs isImportantField allFields;
-
-      fields =
-        builtins.removeAttrs allFields
-        (mapAttrsToList (n: _: n) importantFields);
-    in
-      mkFields importantFields
-      + concatStringsSep "\n" (mapAttrsToList mkSection sections)
-      + mkFields fields;
-  in
-    toHyprconf' initialIndent attrs;
-
   toCfg = name: attrs: let
     # This script fix problem for nitrogen, becauses for some resons
     # nitrogen read path with " chars and throws exception for that

diff --git a/modules/desktop/apps/alacritty.nix b/modules/desktop/apps/alacritty.nix
@@ -1,19 +1,19 @@
 {
-  pkgs,
+  config,
+  lib,
   username,
   ...
-}: {
+}:
+with lib; {
   home-manager.users.${username} = {
     # stylix.targets.alacritty.enable = true;
 
     programs.alacritty = {
       enable = true;
       catppuccin.enable = true;
       settings = {
-        general = {
-          shell = "${pkgs.fish}/bin/fish";
-          "live_config_reload" = false;
-        };
+        shell = getExe config.users.users.${username}.shell;
+        "live_config_reload" = false;
         window = {
           padding = {
             x = 10;

diff --git a/modules/desktop/apps/qt.nix b/modules/desktop/apps/qt.nix
@@ -32,7 +32,7 @@ in {
 
     qt = {
       enable = true;
-      platformTheme = "qtct";
+      platformTheme.name = "qtct";
       style.name = "kvantum";
     };
 

diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix
@@ -12,10 +12,9 @@ in {
   };
 
   config = mkIf (cfg.enable) {
-    services.xserver = {
-      enable = true;
-      # TODO: Update this configuration when nixos 24.05 releases
-      displayManager.sddm = {
+    services.xserver.enable = true;
+    services.displayManager = {
+      sddm = {
         enable = true;
         autoNumlock = true;
       };

diff --git a/modules/desktop/wm/hyprland.nix b/modules/desktop/wm/hyprland.nix
@@ -59,7 +59,7 @@ in
 
             # Input settings
             input = {
-              kb_layout = config.services.xserver.layout;
+              kb_layout = config.services.xserver.xkb.layout;
               follow_mouse = 2;
             };
 

diff --git a/modules/hardware/bootloader.nix b/modules/hardware/bootloader.nix
@@ -38,8 +38,6 @@ in {
   };
 
   config = mkIf (cfg.enable) {
-    # TODO: Replace OS Prober with manual boot entries generated from options
-
     boot.loader.grub = {
       inherit (cfg) extraEntries;
 

diff --git a/modules/services/wallpaper.nix b/modules/services/wallpaper.nix
@@ -1,14 +1,12 @@
 {
   config,
   lib,
-  pkgs,
   username,
   ...
 }:
 with lib;
 with lib.my; let
   cfg = config.modules.services.wallpaper;
-  home = config.home-manager.users.${username};
 in {
   options.modules.services.wallpaper = {
     enable = mkEnableOption "wallpaper config";
@@ -37,40 +35,17 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable) {
-    home-manager.users.${username} = mkMerge [
-      # Enable this config only if Hyprland is enabled
-      # TODO: Update this configuration when nix-community/home-manager#5344 is merged and lands in a stable release
-      (optionalAttrs config.programs.hyprland.enable {
-        xdg.configFile."hypr/hyprpaper.conf" = {
-          text = mapper.toHyprconf {
-            attrs = {
-              ipc = "off";
-              preload = builtins.map (x: ''${x.wallpaper}'') cfg.settings;
-              wallpaper = builtins.map (x: ''${x.monitor.wayland},${x.wallpaper}'') cfg.settings;
-            };
-            importantPrefixes = ["$"];
-          };
-        };
-
-        systemd.user.services."hyprpaper" = {
-          Unit = {
-            ConditionEnvironment = "WAYLAND_DISPLAY";
-            Description = "hyprpaper";
-            After = ["graphical-session-pre.target"];
-            PartOf = ["graphical-session.target"];
-            X-Restart-Triggers = ["${home.xdg.configFile."hypr/hyprpaper.conf".source}"];
-          };
-          Service = {
-            ExecStart = "${getExe pkgs.hyprpaper}";
-            Restart = "always";
-            RestartSec = "10";
-          };
-          Install = {
-            WantedBy = ["graphical-session.target"];
-          };
+  config = mkIf (cfg.enable && config.programs.hyprland.enable) {
+    home-manager.users.${username} = {
+      services.hyprpaper = {
+        enable = true;
+        settings = {
+          ipc = "off";
+          preload = builtins.map (x: ''${x.wallpaper}'') cfg.settings;
+          wallpaper = builtins.map (x: ''${x.monitor.wayland},${x.wallpaper}'') cfg.settings;
         };
-      })
-    ];
+        importantPrefixes = ["$"];
+      };
+    };
   };
 }
diff --git a/modules/shell/eza.nix b/modules/shell/eza.nix
@@ -16,7 +16,6 @@ in {
     home-manager.users.${username} = {
       programs.eza = {
         enable = true;
-        enableAliases = true;
         git = config.modules.dev.git.enable;
         icons = true;
       };