update flake.lock

flake.lock

@@ -35,6 +35,26 @@
         "type": "github"
       }
     },
+    "greg-clients": {
+      "inputs": {
+        "nixpkgs": [
+          "unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716115695,
+        "narHash": "sha256-aI65l4x+U5v3i/nfn6N3eW5IZodmf4pyAByE7vTJh8I=",
+        "ref": "refs/heads/master",
+        "rev": "b9444658fbb39cd1bf1c61ee5a1d5f0641c49abe",
+        "revCount": 73,
+        "type": "git",
+        "url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -42,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706981411,
+        "lastModified": 1715381426,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
         "type": "github"
       },
       "original": {
@@ -64,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710868679,
+        "lastModified": 1713543440,
-        "narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=",
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
         "owner": "guibou",
         "repo": "nixGL",
-        "rev": "d709a8abcde5b01db76ca794280745a43c8662be",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
         "type": "github"
       },
       "original": {
@@ -79,11 +99,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1710838473,
+        "lastModified": 1716361217,
-        "narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
+        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
+        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
         "type": "github"
       },
       "original": {
@@ -95,11 +115,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1710923589,
+        "lastModified": 1716671200,
-        "narHash": "sha256-lKYSsx0BQbcXVZf14vpf2yD7r7pakHQ7173pxXmgvk4=",
+        "narHash": "sha256-MjfhRf3LhIXPRrlKIxIgLNEt1pySaBwazO6+qALjBtY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "6b42f9fe3099d436ada62d4e41a36673caa10bbf",
+        "rev": "386c4b596d7abb4eab6918b4e91071be06772c82",
         "type": "github"
       },
       "original": {
@@ -111,6 +131,7 @@
     "root": {
       "inputs": {
         "dan": "dan",
+        "greg-clients": "greg-clients",
         "home-manager": "home-manager",
         "nixgl": "nixgl",
         "nixpkgs": "nixpkgs",
@@ -120,11 +141,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1710827359,
+        "lastModified": 1716619601,
-        "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=",
+        "narHash": "sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5710127d9693421e78cca4f74fac2db6d67162b1",
+        "rev": "47e03a624662ce399e55c45a5f6da698fc72c797",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,6 +16,9 @@
 
     dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
     dan.inputs.nixpkgs.follows = "unstable";
+
+    greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
+    greg-clients.inputs.nixpkgs.follows = "unstable";
     
     # helix.url = "github:helix-editor/helix";
     # helix.inputs.nixpkgs.follows = "unstable";
@@ -70,6 +73,8 @@
           inherit (prev) system config;
         };
         dan = dan.packages.${prev.system};
+        grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients;
+        gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl;
         # helix = inputs.helix.packages.${prev.system}.helix;
       })
       nur.overlay

profiles/base/default.nix

@@ -58,6 +58,9 @@ in
       progress
 
       file
+      bintools
+
+      gh
       tmux
 
       timewarrior
@@ -65,6 +68,8 @@ in
       unzip
       p7zip
 
+      yt-dlp
+
       parallel
       sshfs
       jq
@@ -74,11 +79,14 @@ in
       bat
       eza
       ripgrep
+
+      gregctl
     ] ++ lib.optionals cfg.plus [
       ffmpeg-full
     ] ++ lib.optionals config.profiles.gui.enable [
       mpv
       sxiv
+      gnome3.eog
 
       dolphin
       plasma5Packages.dolphin-plugins
@@ -120,11 +128,11 @@ in
           };
           bookmarks = {
             "NixOS Options" = {
-              keyword = "no";
+              keyword = "nxo";
               url = "https://search.nixos.org/options?query=%s";
             };
             "NixOS Packages" = {
-              keyword = "np";
+              keyword = "nxp";
               url = "https://search.nixos.org/packages?query=%s";
             };
             "Home-Manager Options" = {
@@ -132,7 +140,7 @@ in
               url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s";
             };
           };
-          extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ];
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [ cookies-txt no-pdf-download sponsorblock ublock-origin ];
         };
       };
     };
@@ -241,6 +249,9 @@ in
           # });
           girt = pkgs.git-interactive-rebase-tool;
         in "${girt}/bin/interactive-rebase-tool";
+        branch.sort = "-committerdate";
+        gpg.format = "ssh";
+        user.signingKey = "~/.ssh/id_rsa.pub";
       };
       delta.enable = true;
     };
@@ -296,6 +307,7 @@ in
 
     home.sessionVariables = {
       EDITOR = "hx";
+      GRZEGORZ_DEFAULT_API_BASE = "https://georg.pvv.ntnu.no/api";
     };
 
     xdg.mimeApps = {

profiles/xsession/default.nix

@@ -69,6 +69,11 @@ in
             "XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute 0 toggle";
             "XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute 1 toggle";
 
+            # Georg volume controls
+            "Shift+XF86AudioRaiseVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- +5%";
+            "Shift+XF86AudioLowerVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- -5%";
+            "Shift+XF86AudioMute" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} toggle";
+
             "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
             "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
 

profiles/zsh/default.nix

@@ -20,7 +20,7 @@ in
         share = false;
       };
       shellAliases = {
-        cat = "bat";
+        cat = "bat -pp";
         ls = "eza";
         tree = "eza -T";
         df = "df -h";
@@ -78,6 +78,8 @@ in
       };
     };
 
+    programs.zoxide.enable = true;
+
     home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [
        pkgs.dan.mesloNFp10k
     ];