Various uncommited configs

2026-04-17 14:03:00 +02:00
parent 62c9dbee4f
commit c9c285de58
5 changed files with 138 additions and 16 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -124,6 +124,24 @@
      }
    },
    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1762040540,
+        "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "0010412d62a25d959151790968765a70c436598b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "stylix",
@@ -281,6 +299,21 @@
        "type": "github"
      }
    },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1761765539,
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1774701658,
@@ -298,6 +331,22 @@
      }
    },
    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1761236834,
+        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
      "locked": {
        "lastModified": 1775036866,
        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
@@ -313,7 +362,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1775579569,
        "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
@@ -329,7 +378,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
      "locked": {
        "lastModified": 1773734432,
        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
@@ -390,6 +439,52 @@
        "type": "github"
      }
    },
+    "qml-niri": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": [
+          "quickshell"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1775384967,
+        "narHash": "sha256-5JuFsu0tPEZrHhj/d5C7eP0+FSLNi9hTW5h/17N3Mbk=",
+        "owner": "imiric",
+        "repo": "qml-niri",
+        "rev": "2d60eb204aa7a9704b7f5cf228b85fb19acbbcee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "imiric",
+        "ref": "main",
+        "repo": "qml-niri",
+        "type": "github"
+      }
+    },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775720097,
+        "narHash": "sha256-p+vqkCuFfVNyQBo370wr6MebNUvz55RZiC0m8YKUhvQ=",
+        "ref": "refs/heads/master",
+        "rev": "d4c92973b53d9fa34cc110d3b974eb6bde5b3027",
+        "revCount": 800,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      }
+    },
    "root": {
      "inputs": {
        "flake-parts": "flake-parts",
@@ -398,6 +493,8 @@
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
        "nixvim": "nixvim",
+        "qml-niri": "qml-niri",
+        "quickshell": "quickshell",
        "stylix": "stylix",
        "wrapper-modules": "wrapper-modules",
        "wrappers": "wrappers"
@@ -410,9 +507,9 @@
        "base16-helix": "base16-helix",
        "base16-vim": "base16-vim",
        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
        "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
        "nur": "nur",
        "systems": "systems_2",
        "tinted-kitty": "tinted-kitty",
@@ -528,9 +625,27 @@
        "type": "github"
      }
    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1762410071,
+        "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "97a30861b13c3731a84e09405414398fbf3e109f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
    "wrapper-modules": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
        "lastModified": 1775724285,
@@ -548,7 +663,7 @@
    },
    "wrappers": {
      "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
        "lastModified": 1775600302,
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,17 @@
        url = "github:feel-co/hjem";
        inputs.nixpkgs.follows = "nixpkgs";
    };
+    quickshell = {
+        url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+        inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    qml-niri = {
+        url = "github:imiric/qml-niri/main";
+        inputs.nixpkgs.follows = "nixpkgs";
+        inputs.quickshell.follows = "quickshell";
+    };
+    
  };

  outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree [ ./modules ]); 
--- a/modules/features/lf.nix
+++ b/modules/features/lf.nix
@@ -47,7 +47,7 @@
 				map gv cd ~/Videos
 				map go cd ~/Documents
 				map gc cd ~/.config
-				map gn cd ~/Documents/MyNixOs
+				map gn cd ~/Documents/AsdamNixOS
 				map gp cd ~/Documents/Projects
 				map gs cd ~/.local/share
 				map gm cd /run/media
@@ -62,9 +62,9 @@
 				map <C-d> 5j
 				map <C-u> 5k

-				setlocal ~/Documents/Projects sortby time
-				setlocal ~/Documents/Projects/* sortby time
-				setlocal ~/Downloads/ sortby time 
+				#setlocal ~/Documents/Projects sortby time
+				#setlocal ~/Documents/Projects/* sortby time
+				#setlocal ~/Downloads/ sortby time 
 				'';
 	in {
 		packages.mylf = inputs.wrappers.lib.wrapPackage {
--- a/modules/features/quickshell.nix
+++ b/modules/features/quickshell.nix
@@ -2,12 +2,7 @@
    flake.nixosModules.quickshell = {pkgs, ...}: {
        environment.systemPackages = with pkgs; [
            quickshell
+            inputs.qml-niri
        ];
-
-        inputs = {
-            url = "github:imiric/qml-niri/main";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.quickshell.follows = "quickshell";
-        };
    };
 }
--- a/modules/host/laptop/configuration.nix
+++ b/modules/host/laptop/configuration.nix
@@ -82,6 +82,7 @@
        environment.systemPackages = with pkgs; [
            vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
            wget
+            zathura
            #self.packages.${pkgs.system}.lf
        ];