flake.lock: Update

Flake lock file updates:

• Updated input 'catppuccin':
    'github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e' (2025-01-05)
  → 'github:catppuccin/nix/4a5ac694d7f8a63dec75cbe0ac1c84c818b6b789' (2025-01-13)
• Updated input 'catppuccin/catppuccin-v1_2':
    'https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz?narHash=sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA%3D' (2024-12-20)
  → 'https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz?narHash=sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek%3D' (2024-12-20)
• Updated input 'catppuccin/home-manager':
    'github:nix-community/home-manager/1395379a7a36e40f2a76e7b9936cc52950baa1be' (2024-12-19)
  → 'github:nix-community/home-manager/2532b500c3ed2b8940e831039dcec5a5ea093afc' (2025-01-10)
• Updated input 'catppuccin/home-manager-stable':
    'github:nix-community/home-manager/80b0fdf483c5d1cb75aaad909bd390d48673857f' (2024-12-16)
  → 'github:nix-community/home-manager/bd65bc3cde04c16755955630b344bc9e35272c56' (2025-01-08)
• Updated input 'catppuccin/nixpkgs':
    'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33' (2024-12-17)
  → 'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04)
• Updated input 'catppuccin/nixpkgs-stable':
    'github:NixOS/nixpkgs/b47fd6fa00c6afca88b8ee46cfdb00e104f50bca' (2024-12-19)
  → 'github:NixOS/nixpkgs/cbd8ec4de4469333c82ff40d057350c30e9f7d36' (2025-01-05)
• Updated input 'catppuccin/nuscht-search':
    'github:NuschtOS/search/3051be7f403bff1d1d380e4612f0c70675b44fc9' (2024-12-09)
  → 'github:NuschtOS/search/836908e3bddd837ae0f13e215dd48767aee355f0' (2025-01-02)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/244a2ab1459c72bac32a2db088549f8bc6d7a836' (2025-01-13)
  → 'github:nix-community/emacs-overlay/4fad271473a3c52568acf39ae3c2e9b9364124dd' (2025-01-15)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/130595eba61081acde9001f43de3248d8888ac4a' (2025-01-10)
  → 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3' (2025-01-13)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/1dab772dd4a68a7bba5d9460685547ff8e17d899' (2025-01-10)
  → 'github:NixOS/nixpkgs/9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc' (2025-01-14)
• Updated input 'homeManager':
    'github:nix-community/home-manager/9616d81f98032d1ee9bec68ab4b6a8c833add88c' (2025-01-13)
  → 'github:nix-community/home-manager/fc52a210b60f2f52c74eac41a8647c1573d2071d' (2025-01-13)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2' (2025-01-12)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=acbb3cff2d1a8b998135dc6f48cdd7fda85a3124' (2025-01-14)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/72a0601f36a1b424e8b72f17ff53509b990ee060' (2025-01-11)
  → 'github:NixOS/mobile-nixos/43fba7218ebbd450f8b578be10bab2a726f470a0' (2025-01-14)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/6ace2f2d12bdf74235d5cbf9fbd34a71c9716685' (2025-01-11)
  → 'github:LnL7/nix-darwin/bd921223ba7cdac346477d7ea5204d6f4736fcc6' (2025-01-14)
• Updated input 'nixDarwin/nixpkgs':
    'github:NixOS/nixpkgs/e913ae340076bbb73d9f4d3d065c2bca7caafb16' (2024-06-11)
  → 'github:NixOS/nixpkgs/8c9fd3e564728e90829ee7dbac6edc972971cd0f' (2025-01-07)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6' (2025-01-12)
  → 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3' (2025-01-13)

flake.lock

@@ -260,27 +260,6 @@
       }
     },
     "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nix-fast-build",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
@@ -298,7 +277,7 @@
         "type": "github"
       }
     },
-    "flake-parts_5": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixThePlanet",
@@ -473,7 +452,7 @@
     },
     "hercules-ci-effects": {
       "inputs": {
-        "flake-parts": "flake-parts_5",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
@@ -767,28 +746,6 @@
         "type": "github"
       }
     },
-    "nix-fast-build": {
-      "inputs": {
-        "flake-parts": "flake-parts_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix_2"
-      },
-      "locked": {
-        "lastModified": 1736592044,
-        "narHash": "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=",
-        "owner": "Mic92",
-        "repo": "nix-fast-build",
-        "rev": "906af17fcd50c84615a4660d9c08cf89c01cef7d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "nix-fast-build",
-        "type": "github"
-      }
-    },
     "nix-formatter-pack": {
       "inputs": {
         "nixpkgs": [
@@ -879,7 +836,7 @@
     },
     "nixThePlanet": {
       "inputs": {
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_3",
         "hercules-ci-effects": "hercules-ci-effects",
         "nixpkgs": "nixpkgs_8",
         "osx-kvm": "osx-kvm"
@@ -1341,13 +1298,12 @@
         "lix-eval-jobs": "lix-eval-jobs",
         "lix-module": "lix-module",
         "mobile-nixos": "mobile-nixos",
-        "nix-fast-build": "nix-fast-build",
         "nix-on-droid": "nix-on-droid",
         "nixDarwin": "nixDarwin",
         "nixThePlanet": "nixThePlanet",
         "nixosHardware": "nixosHardware",
         "nixpkgs": "nixpkgs_9",
-        "treefmt-nix": "treefmt-nix_3",
+        "treefmt-nix": "treefmt-nix_2",
         "vscode-server": "vscode-server"
       }
     },
@@ -1492,27 +1448,6 @@
       }
     },
     "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-fast-build",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736154270,
-        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"

flake.nix

@@ -59,10 +59,6 @@
     };
     catppuccin.url = "github:catppuccin/nix";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
-    nix-fast-build = {
-      url = "github:Mic92/nix-fast-build";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =

hmModules/emacs/init.el

@@ -1016,26 +1016,41 @@ This is meant to be an helper to be called from the window manager."
 
 ;;; Experiments, remove from here
 
-
+(defun ccr/test (niri-socket)
-(defun ccr/test ()
+  "Select a window and focus it based on `niri msg` output."
-  "test"
   (interactive)
-  (with-selected-frame 
+  (let* ((niri-output (ccr/niri-get-windows niri-socket))
-      (make-frame '((name . "Emacs Selector")
+         (display-list (mapcar (lambda (entry)
-                    (minibuffer . only)
+                                 (let ((title (cdr (assoc 'title entry)))
-                    (fullscreen . 0)	; no fullscreen
+                                       (app-id (cdr (assoc 'app_id entry)))
-                    (undecorated . t)	; remove title bar
+                                       (id (cdr (assoc 'id entry))))
-                    ;;(auto-raise . t) ; focus on this frame
+                                   (cons (format "%s - %s" title app-id) id)))
-                    ;;(tool-bar-lines . 0)
+                               niri-output)))
-                    ;;(menu-bar-lines . 0)
+    (with-selected-frame
-                    (internal-border-width . 10)
+        (make-frame '((name . "Emacs Selector")
-                    (width . 50)
+                      (minibuffer . only)
-                    (height . 10)))
+                      (fullscreen . 0)
-    (unwind-protect
+                      (undecorated . t)
-	(completing-read "ciao " '("foo" "bar" "pippo") nil t "")
+                      (internal-border-width . 10)
-      (delete-frame))))
+                      (width . 120)
+                      (height . 20)))
+      (unwind-protect
+          (let* ((entry (completing-read "Select window: " (mapcar #'car display-list) nil t ""))
+                 (entry-id (cdr (assoc entry display-list)))  ;; Get the ID associated with the selected entry
+                 (command (format "NIRI_SOCKET=\"%s\" niri msg action focus-window --id %s" niri-socket entry-id)))
+	    (message command)
+            (shell-command command))
+        (delete-frame)))))
 
 
+(defun ccr/niri-get-windows (niri-socket)
+  "Esegue `niri msg --json windows` e parse l'output JSON in una alist."
+  (let* ((command (format "NIRI_SOCKET=\"%s\" niri msg --json windows" niri-socket))
+	 (output (shell-command-to-string command))
+	 (json-object-type 'alist)	; Usa alist per rappresentare gli oggetti JSON
+	 (parsed-json (json-read-from-string output)))
+    parsed-json))
+
 
 (provide 'init)
 ;;; init.el ends here

hmModules/gpg/default.nix

@@ -2,25 +2,13 @@
 {
   services.gpg-agent = {
     enable = true;
-    enableSshSupport = true;
+    pinentryPackage = pkgs.pinentry-rofi.override {
-    extraConfig =
+      rofi = pkgs.rofi-wayland;
-      let
+    };
-        pinentryRofi = pkgs.writeShellApplication {
+    extraConfig = ''
-          name = "pinentry-rofi-with-env";
+      allow-emacs-pinentry
-          runtimeInputs = with pkgs; [
+      allow-loopback-pinentry
-            coreutils
+    '';
-            rofi-wayland
-          ];
-          text = ''
-            "${pkgs.pinentry-rofi}/bin/pinentry-rofi" "$@"
-          '';
-        };
-      in
-      ''
-        allow-emacs-pinentry
-        allow-loopback-pinentry
-        pinentry-program ${pinentryRofi}/bin/pinentry-rofi-with-env
-      '';
   };
 
   programs.gpg = {

hmModules/hyprland/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }:
 let
@@ -52,29 +53,34 @@ in
 
   services.udiskie.enable = true;
 
+  home.pointerCursor = {
+    gtk.enable = true;
+    x11.enable = true;
+    package = pkgs.catppuccin-cursors;
+    name = "catppuccin-mocha-sapphire";
+    size = 38;
+  };
+
   gtk = {
     enable = true;
-    # font.name = lib.mkForce "Sans,Symbols Nerd Font";
+    theme = {
+      name = "Catppuccin-GTK-Purple-Dark-Compact";
+      package = pkgs.magnetic-catppuccin-gtk.override {
+        accent = [ "purple" ];
+        shade = "dark";
+        size = "compact";
+      };
+    };
     iconTheme = {
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    cursorTheme = {
-      name = "catppuccin-mocha-sapphire";
-      package = pkgs.catppuccin-cursors;
-      size = 38;
-    };
   };
 
   qt = {
     enable = true;
   };
 
-  home.file.".icons/catppuccin-mocha-sapphire" = {
-    source = "${pkgs.catppuccin-cursors.mochaSapphire}/share/icons/catppuccin-mocha-sapphire-cursors";
-    recursive = true;
-  };
-
   wayland.windowManager.hyprland = {
     enable = true;
     plugins = with pkgs.hyprlandPlugins; [

hmModules/niri/config.kdl

@@ -301,9 +301,18 @@ window-rule {
 }
 
 window-rule {
-  match app-id=r#"^Emacs Selector$"#
+  match title=r#"^Emacs Selector$"#
+  opacity 0.95
+  open-floating true
+  open-focused true
 }
 
+window-rule {
+  match title=r#"^bTop$"#
+  opacity 0.95
+  open-floating true
+  open-focused true
+}
 
 
 
@@ -334,9 +343,9 @@ binds {
     Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
     Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))"; }
     Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
-    Super+Alt+L { spawn "swaylock"; }
+    Mod+Alt+L { spawn "swaylock"; }
     Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
-
+    Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "210x60" "btop";}
 
     // Example volume keys mappings for PipeWire & WirePlumber.
     // The allow-when-locked=true property makes them work even when the session is locked.

hmModules/swayidle/default.nix

@@ -48,10 +48,4 @@
         }
       ];
     };
-
-  # Otherwise it will start only after Sway and will not work with Hyprland
-  systemd.user.services.swayidle = {
-    Unit.PartOf = lib.mkForce [ ];
-    Install.WantedBy = lib.mkForce [ "graphical-session-pre.target" ];
-  };
 }

hosts/default.nix

@@ -14,20 +14,22 @@
       deltaflyer = {
         nixpkgs =
           let
-            # keep in sync with https://github.com/NixOS/mobile-nixos/blob/development/pkgs.nix
+            # keep in sync with https://github.com/mobile-nixos/mobile-nixos/blob/development/npins/sources.json
-            rev = "44d0940ea560dee511026a53f0e2e2cde489b4d4";
+            rev = "d3c42f187194c26d9f0309a8ecc469d6c878ce33";
           in
           builtins.getFlake "github:NixOS/nixpkgs/${rev}";
         extraHmModules = [
-          # inputs.ccrEmacs.hmModules.default
+          inputs.catppuccin.homeManagerModules.catppuccin
         ];
         vpn = {
           ip = "10.100.0.5";
           publicKey = "6bzmBx2b5yzMdW0aK0KapoBesNcxTv5+qdo+pGmG+jc=";
         };
-        homeManager = builtins.getFlake "github:nix-community/home-manager/670d9ecc3e46a6e3265c203c2d136031a3d3548e";
+        # homeManager = builtins.getFlake "github:nix-community/home-manager/670d9ecc3e46a6e3265c203c2d136031a3d3548e";
         extraModules = [
           (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-fajita"; })
+          inputs.catppuccin.nixosModules.catppuccin
+          inputs.lix-module.nixosModules.default
         ];
         secrets = {
           "deltaflyer-wireguard-private-key" = { };

hosts/deltaflyer/default.nix

@@ -30,6 +30,13 @@
     # INSECURE STUFF FIRST
     # Users and hardcoded passwords.
     {
+      nixpkgs.overlays = [
+        (prev: final: {
+          gcc7 = final.gcc;
+          gcc8 = final.gcc;
+        })
+      ];
+
       users.users.root.password = "nixos";
       # users.users.ccr.password = "1234";
 
@@ -66,11 +73,13 @@
           "git"
           "shell"
           "helix"
-          "hyprland"
+          # "hyprland"
+          "niri"
           "emacs"
           "firefox"
           "mpv"
           "xdg"
+          "catppuccin"
         ];
         extraGroups = [
           "dialout"
@@ -99,18 +108,18 @@
       ccr.extraModules = [
         {
           programs.fish.loginShellInit = ''
-            pgrep Hypr >/dev/null || exec dbus-run-session Hyprland
+            pgrep niri >/dev/null || exec niri-session
-          '';
-          wayland.windowManager.hyprland.extraConfig = lib.mkAfter ''
-            monitor = DSI-1, 1080x2340, 0x0, 2, transform, 1
-            input {
-              touchdevice {
-                transform = 1
-              }
-            }
-            bind = $mod, r, exec, rotate-screen hor
-            bind = $mod SHIFT, r, exec, rotate-screen ver
           '';
+          # wayland.windowManager.hyprland.extraConfig = lib.mkAfter ''
+          #   monitor = DSI-1, 1080x2340, 0x0, 2, transform, 1
+          #   input {
+          #     touchdevice {
+          #       transform = 1
+          #     }
+          #   }
+          #   bind = $mod, r, exec, rotate-screen hor
+          #   bind = $mod SHIFT, r, exec, rotate-screen ver
+          # '';
           home.packages =
             let
               rotateScript = pkgs.writeShellApplication {

hosts/deltaflyer/plasma-mobile.nix

@@ -3,6 +3,7 @@
 #
 {
   lib,
+  pkgs,
   ...
 }:
 {
@@ -16,35 +17,38 @@
 
     #   # desktopManager.plasma5.mobile.enable = true;
 
-    #   displayManager.autoLogin = {
+    displayManager.autoLogin = {
-    #     enable = true;
+      enable = true;
-    #   };
+      user = "ccr";
+    };
 
-    #   displayManager.session = [{
+    displayManager.session = [
-    #     manage = "desktop";
+      {
-    #     name = "hyprland";
+        manage = "desktop";
-    #     start = ''
+        name = "niri";
-    #       ${pkgs.hyprland}/bin/Hyprland &
+        start = ''
-    #       waitPID=$!
+          ${pkgs.niri}/bin/niri-session &
-    #     '';
+          waitPID=$!
-    #     }];
+        '';
+      }
+    ];
 
-    #   displayManager.defaultSession = "hyprland";
+    displayManager.defaultSession = "niri";
 
-    #   displayManager.lightdm = {
+    displayManager.lightdm = {
-    #     enable = true;
+      enable = true;
-    #     # Workaround for autologin only working at first launch.
+      # Workaround for autologin only working at first launch.
-    #     # A logout or session crashing will show the login screen otherwise.
+      # A logout or session crashing will show the login screen otherwise.
-    #     extraSeatDefaults = ''
+      extraSeatDefaults = ''
-    #       session-cleanup-script=${pkgs.procps}/bin/pkill -P1 -fx ${pkgs.lightdm}/sbin/lightdm
+        session-cleanup-script=${pkgs.procps}/bin/pkill -P1 -fx ${pkgs.lightdm}/sbin/lightdm
-    #     '';
+      '';
-    #   };
+    };
 
     libinput.enable = true;
   };
 
   hardware.bluetooth.enable = true;
-  hardware.pulseaudio.enable = lib.mkDefault true; # mkDefault to help out users wanting pipewire
+  hardware.pulseaudio.enable = lib.mkDefault false; # mkDefault to help out users wanting pipewire
   networking.networkmanager.enable = true;
   networking.wireless.enable = false;
   powerManagement.enable = true;

modules/nix/default.nix

@@ -8,12 +8,13 @@
 {
   nixpkgs.overlays = [
     (final: _: {
-      nix-fast-build = fleetFlake.inputs.nix-fast-build.packages.${final.system}.nix-fast-build // {
+      nix-eval-jobs =
-        nix = final.nix;
+        (fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs.override {
-      };
+          nix = final.nix;
-      nix-eval-job = fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs // {
+        })
-        nix = final.nix;
+        // {
-      };
+          nix = final.nix;
+        };
     })
   ];