Merge remote-tracking branch 'origin/main' into thinkpad

home-manager/default.nix

@@ -11,7 +11,6 @@ in
 {
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
-    inputs.nixvim.homeManagerModules.nixvim
     ./btop.nix
     ./cava
     ./cursors.nix
@@ -27,7 +26,7 @@ in
     ./rofi
     ./wlogout
     ./hyprland
-    ./spicetify.nix
+    ./spicetify.nix # TODO env conflict on latest version
     ./yazi
   ];
 
@@ -35,9 +34,7 @@ in
     enable = true;
     settings = {
       # Prefer dark mode for all GTK apps
-      "org/gnome/desktop/interface" = {
+      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
-        color-scheme = "prefer-dark";
-      };
     };
   };
 

home-manager/development/nixvim/default.nix

@@ -1,5 +1,11 @@
 # Neovim configuration for Nix
+{ inputs, ... }:
+
 {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
+
   catppuccin.nvim.enable = true;
 
   home.sessionVariables.EDITOR = "nvim";

home-manager/fastfetch.nix

@@ -1,57 +1,60 @@
 {
-  programs.fastfetch = {
+  programs = {
-    enable = true;
+    fish.shellAliases.fetch = "fastfetch";
-    settings = {
+    fastfetch = {
-      logo = {
+      enable = true;
-        source = "${../Catppuccin.png}";
+      settings = {
-        type = "kitty";
+        logo = {
-        height = 18;
+          source = "${../Catppuccin.png}";
-        padding.top = 2;
+          type = "kitty";
+          height = 18;
+          padding.top = 2;
+        };
+        display.separator = " ";
+        modules =
+          let
+            keyColor = "34";
+            module = type: key: {
+              inherit type key keyColor;
+            };
+            formatModule = type: key: format: {
+              inherit
+                type
+                key
+                format
+                keyColor
+                ;
+            };
+          in
+          [
+            "break"
+            "break"
+            {
+              type = "title";
+              keyWidth = 10;
+            }
+            "break"
+            (module "os" " ")
+            (module "kernel" " ")
+            (formatModule "packages" " " "{} (nixpkgs)")
+            (module "shell" " ")
+            (module "terminal" " ")
+            (module "wm" " ")
+            (module "theme" " ")
+            (module "cursor" " ")
+            (module "terminalfont" " ")
+            (module "uptime" " ")
+            (formatModule "datetime" " " "{1}-{3}-{11}")
+            (module "cpu" " ")
+            (module "gpu" "󰤽 ")
+            (module "sound" " ")
+            (module "lm" " ")
+            "break"
+            "colors"
+            "break"
+            "break"
+          ];
       };
-      display.separator = " ";
-      modules =
-        let
-          keyColor = "34";
-          module = type: key: {
-            inherit type key keyColor;
-          };
-          formatModule = type: key: format: {
-            inherit
-              type
-              key
-              format
-              keyColor
-              ;
-          };
-        in
-        [
-          "break"
-          "break"
-          {
-            type = "title";
-            keyWidth = 10;
-          }
-          "break"
-          (module "os" " ")
-          (module "kernel" " ")
-          (formatModule "packages" " " "{} (nixpkgs)")
-          (module "shell" " ")
-          (module "terminal" " ")
-          (module "wm" " ")
-          (module "theme" " ")
-          (module "cursor" " ")
-          (module "terminalfont" " ")
-          (module "uptime" " ")
-          (formatModule "datetime" " " "{1}-{3}-{11}")
-          (module "cpu" " ")
-          (module "gpu" "󰤽 ")
-          (module "sound" " ")
-          (module "lm" " ")
-          "break"
-          "colors"
-          "break"
-          "break"
-        ];
     };
   };
 }

home-manager/fish.nix

@@ -17,9 +17,15 @@ in
   programs = {
     fish = {
       enable = true;
+      # Start starship when creating a new shell
+      interactiveShellInit = ''
+        starship init fish | source
+        fortune | cowsay -f tux
+      '';
       plugins = [
         {
           # !! to get the previous command
+          # https://github.com/BrewingWeasel/fishbang
           name = "fishbang";
           src = pkgs.fetchFromGitHub {
             owner = "BrewingWeasel";
@@ -29,6 +35,9 @@ in
           };
         }
       ];
+      shellAliases = {
+        nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
+      };
     };
 
     starship = {

home-manager/kitty.nix

@@ -8,14 +8,18 @@ in
     flavor = theme.flavor;
   };
 
-  programs.kitty = {
+  programs = {
-    enable = common.default.terminal == "kitty";
+    # Transfer shell config to target device
-    font.name = theme.nerdFont;
+    fish.shellAliases.ssh = "kitty +kitten ssh";
-    settings = {
+    kitty = {
-      background_blur = 5;
+      enable = common.default.terminal == "kitty";
-      background_opacity = 0.8;
+      font.name = theme.nerdFont;
-      confirm_os_window_close = 0;
+      settings = {
-      window_padding_width = 10;
+        background_blur = 5;
+        background_opacity = 0.8;
+        confirm_os_window_close = 0;
+        window_padding_width = 10;
+      };
     };
   };
 }

home-manager/mpv.nix

@@ -8,13 +8,22 @@
       flavor = theme.flavor;
     };
 
-  programs.mpv = {
+  programs = {
-    enable = true;
+    fish.shellAliases.mpvl = "mpv --profile=loop";
-    config = {
+    mpv = {
-      hwdec = "auto-safe";
+      enable = true;
-      vo = "gpu";
+      config = {
-      profile = "gpu-hq";
+        hwdec = "auto-safe";
-      gpu-context = "wayland";
+        vo = "gpu";
+        profile = "gpu-hq";
+        gpu-context = "wayland";
+      };
+      profiles = {
+        loop = {
+          loop-playlist = "inf";
+          loop-file = "inf";
+        };
+      };
     };
   };
 }

modules/default.nix

@@ -10,8 +10,8 @@
     ./hyprland
     ./sddm.nix
     ./security.nix
+    ./shell.nix
     ./steam.nix
-    ./terminal
     ./qt.nix
   ];
 }

modules/hyprland/default.nix

@@ -6,6 +6,7 @@
     xdg-desktop-portal-hyprland
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
+    # unstable.hyprsysteminfo TODO requires flake update
   ];
 
   programs = {

modules/shell.nix

@@ -0,0 +1,19 @@
+# For Fish dotfiles, see: /home-manager/fish.nix
+{ pkgs, ... }:
+
+{
+  programs = {
+    bash = {
+      # Starts the OS using Bash, then starts fish if it's not running
+      interactiveShellInit = ''
+        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+        then
+          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+        fi
+      '';
+    };
+
+    fish.enable = true;
+  };
+}

modules/terminal/default.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./shell.nix
-  ];
-
-  environment.systemPackages = with pkgs; [
-    kitty
-  ];
-}

modules/terminal/shell.nix

@@ -1,32 +0,0 @@
-# For Fish dotfiles, see: /home-manager/fish.nix and home-manager/starship.nix
-{ pkgs, ... }:
-
-{
-  programs = {
-    bash = {
-      # Starts the OS using Bash, then starts fish if it's not running
-      interactiveShellInit = ''
-        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-        then
-          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-        fi
-      '';
-    };
-
-    fish = {
-      enable = true;
-      # Start starship when creating a new shell
-      interactiveShellInit = ''
-        starship init fish | source
-        fortune | cowsay -f tux
-      '';
-      shellAliases = {
-        # Transfer shell config to target device
-        ssh = "kitty +kitten ssh";
-        nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
-        fetch = "fastfetch";
-      };
-    };
-  };
-}