niri-tag, atagen cache

.gitea/workflows/nix.yaml

@@ -0,0 +1,11 @@
+name: NixOS Build
+on: [push]
+
+jobs:
+  build-config:
+    runs-on: [native]
+    name: build quiver nixos config
+    steps:
+     - uses: actions/checkout@v4
+     - run: nix build --no-link .#nixosConfigurations.quiver.config.system.build.toplevel
+        

.gitignore

@@ -1,2 +1,6 @@
 home/dots/qtile/.direnv
 mullvad/inactive
+result
+*.key
+*.pub_key
+hosts/

flake.nix

@@ -16,6 +16,8 @@
             culr
             meat
             niri
+            niri-tag
+            lix-module
             # smooooth
           ])
           ++ [
@@ -64,8 +66,6 @@
 
     meat = {
       url = "git+https://git.atagen.co/atagen/meat";
-      inputs.lix.follows = "lix";
-      inputs.lix-module.follows = "lix-module";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -74,15 +74,15 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    comfyui = {
-      url = "path:./flakes/comfyui";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # comfyui = {
+    #   url = "path:./flakes/comfyui";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
-    comfyui-plugins = {
-      url = "path:./flakes/comfyui-plugins";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # comfyui-plugins = {
+    #   url = "path:./flakes/comfyui-plugins";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     niri.url = "github:sodiboo/niri-flake";
 
@@ -101,6 +101,12 @@
     nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
     # smooooth.url = "path:/home/bolt/code/smooooth";
+
+    niri-tag = {
+      url = "git+https://git.atagen.co/atagen/niri-tag";
+      inputs.niri-flake.follows = "niri";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
 }

flakes/niri-session-manager/result

@@ -1 +0,0 @@
-/nix/store/731lnc1qjhq5gcrvmqycbm41r2ga3dqa-niri-session-manager-git-e8732380991bd629a7e6c3fb5ea50317084fb1eb

home/home.nix

@@ -51,13 +51,12 @@
   home.packages =
     let
       inherit (rice) icons fonts cursor;
-      inherit (pkgs) tauon;
     in
     fonts.pkgs
     ++ icons.pkgs
     ++ [
       cursor.package
-      tauon
+      pkgs.tauon
     ];
 
   systemd.user.targets.tray = {

home/modules/niri.nix

@@ -4,7 +4,6 @@
   config,
   rice,
   inputs,
-  mainUser,
   ...
 }:
 let
@@ -37,7 +36,7 @@ let
     [
       {
         name = "swaybg";
-        value = "${lib.getExe swaybg} -m fill -i /home/${mainUser}/.nix/wallpaper.jpg";
+        value = "${lib.getExe swaybg} -m fill -i ${rice.bg.src}";
       }
       {
         name = "avizo-service";
@@ -69,7 +68,12 @@ in
   );
   programs.niri.settings =
     let
-      inherit (lib) range nameValuePair mapAttrs';
+      inherit (lib)
+        range
+        nameValuePair
+        mapAttrs'
+        mergeAttrs
+        ;
       inherit (builtins) listToAttrs replaceStrings;
       inherit (config.lib.niri) actions;
     in
@@ -100,7 +104,22 @@ in
                 value = {
                   action."${cmd}" = num;
                 };
-              }) (range 0 6)
+              }) (range 1 6)
+            );
+          tagctl = lib.getExe' inputs.niri-tag.packages.${pkgs.system}.unstable "tagctl";
+          makeTagBind =
+            mods: cmd:
+            listToAttrs (
+              map (num: {
+                name = "${mods}+${builtins.toString num}";
+                value = {
+                  action.spawn = [
+                    tagctl
+                    cmd
+                    (builtins.toString num)
+                  ];
+                };
+              }) (range 1 6)
             );
         in
         {
@@ -152,14 +171,18 @@ in
           ];
           "Mod+Space".action = actions.toggle-window-floating;
         }
-        // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds
+        # // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds
         // makeDirBind "Mod" "focus-column-or-monitor-$DIR" hBinds
-        // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds
+        # // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds
         // makeDirBind "Mod+Shift" "move-column-$DIR-or-to-monitor-$DIR" hBinds
         // makeDirBind "Mod+Ctrl" "consume-or-expel-window-$DIR" hBinds
         // makeDirBind "Mod+Ctrl" "move-window-$DIR" vBinds
-        // makeWsBind "Mod" "focus-workspace"
-        // makeWsBind "Mod+Shift" "move-window-to-workspace";
+        // makeTagBind "Mod" "toggle-tag"
+        // makeTagBind "Mod+Shift" "toggle"
+        // makeTagBind "Mod+Ctrl" "exclusive-tag"
+      # // makeWsBind "Mod" "focus-workspace"
+      # // makeWsBind "Mod+Shift" "move-window-to-workspace";
+      ;
       outputs = {
         # "Unknown-1".enable = false;
         "DP-1" = {
@@ -172,7 +195,7 @@ in
         };
       };
       input = {
-        warp-mouse-to-focus = true;
+        warp-mouse-to-focus.enable = true;
       };
       cursor = {
         hide-after-inactive-ms = 5000;

rice/default.nix

@@ -91,8 +91,6 @@ rec {
       name = "Papirus-Dark";
       pkgs = [
         package
-        # material-icons
-        # material-design-icons
       ];
     };
 
@@ -108,18 +106,19 @@ rec {
     gaps_out = 72;
   };
 
-  bg = {
+  bg = rec {
+    src =
+      let
+        name = "wallpaper.jpg";
+      in
+      builtins.path {
+        inherit name;
+        path = ./${name};
+        sha256 = "2db3f9d0397fbd4746ada297bd14c0c7d3e22c7d4e894968fcfece90bbfb902a";
+      };
     image = pkgs.callPackage ./wallpaper.nix { } {
       palette = toRGBShortHex palette;
-      wallpaper =
-        let
-          name = "wallpaper.jpg";
-        in
-        builtins.path {
-          inherit name;
-          path = ./${name};
-          sha256 = "2db3f9d0397fbd4746ada297bd14c0c7d3e22c7d4e894968fcfece90bbfb902a";
-        };
+      wallpaper = src;
     };
   };
 

system/modules/bootloader.nix

@@ -10,7 +10,7 @@
         pal = rice.palette.shortHex;
       in
       {
-        wallpapers = [ rice.bg.image ];
+        wallpapers = [ rice.bg.src ];
         interface = {
           brandingColor = 1;
           branding = "welcome to quiver";

system/modules/wm.nix

@@ -24,4 +24,5 @@
     enable = true;
     package = inputs.niri.packages.${pkgs.system}.niri-unstable;
   };
+  services.niri-tag.enable = true;
 }

system/substituters.nix

@@ -9,6 +9,7 @@
       "https://helix.cachix.org"
       "https://walker-git.cachix.org"
       "https://anmonteiro.nix-cache.workers.dev"
+      "https://cache.atagen.co"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
@@ -16,6 +17,7 @@
       "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
       "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
       "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="
+      "cache.atagen.co:aw7n3q/HD/kJ5cZSjK+BUE3Ics8e0OuaXO5EkV7GCeI="
     ];
   };
 }