summary refs log tree commit diff
diff options
context:
space:
mode:
authortzlil <tzlils@protonmail.com>2024-04-19 18:02:16 +0300
committertzlil <tzlils@protonmail.com>2024-04-19 18:02:16 +0300
commitf6998f6492693a2c53eaf5e4be9cd65cb36d6128 (patch)
tree235bb4d4e73218cc50ac503fbd65c9d939b93efd
parentff3f8bf2ed6a4d5f5169ec1925db9d1e0a14568c (diff)
updated flake and added window switcher HEAD master
-rw-r--r--flake.lock84
-rw-r--r--hosts/navi/default.nix15
-rw-r--r--mixins/sway.nix25
3 files changed, 79 insertions, 45 deletions
diff --git a/flake.lock b/flake.lock
index fcbb580..4bdaf59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1707830867,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "lastModified": 1712079060,
+        "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "1381a759b205dff7a6818733118d02253340fd5e",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711006105,
-        "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=",
+        "lastModified": 1713406758,
+        "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6",
+        "rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1711080247,
-        "narHash": "sha256-INIn5/6anm9rW+DhOfL83O3Z5vka9IQA7WQOA/CyxEU=",
+        "lastModified": 1713520747,
+        "narHash": "sha256-B/eMUH0NMEnN7f+6AHanWrESsjHPtEGUSx+BFA6Be88=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "83a5049cfc2e37d9ef5b540aa01c0e5cc1e2a00f",
+        "rev": "f6077eac13df7d0d5c63cd40efd3e0a0070d1fb1",
         "type": "gitlab"
       },
       "original": {
@@ -132,11 +132,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+        "lastModified": 1712014858,
+        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1710783728,
-        "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
+        "lastModified": 1713521961,
+        "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
+        "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
         "type": "github"
       },
       "original": {
@@ -248,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710974515,
-        "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
+        "lastModified": 1713521108,
+        "narHash": "sha256-dPKSkVA5PcDkW3tsoPOtzr5QHOHR25PuuMdBKUA763c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
+        "rev": "b5b2b1ac63458357e205bcb2df2d0840a2acca13",
         "type": "github"
       },
       "original": {
@@ -269,11 +269,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708591310,
-        "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
+        "lastModified": 1712759992,
+        "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
+        "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
         "type": "github"
       },
       "original": {
@@ -304,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710644923,
-        "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=",
+        "lastModified": 1713067146,
+        "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "e25efda85e39fcdc845e371971ac4384989c4295",
+        "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708597894,
-        "narHash": "sha256-KxpKOBDGPJ76k37vLukYHp/wd7U4DoUVIvy8atHfy/k=",
+        "lastModified": 1709985524,
+        "narHash": "sha256-29ZwMJBErP41ZPis1MskhdheDRgt+reDuf53jONSkc8=",
         "owner": "nixpak",
         "repo": "nixpak",
-        "rev": "535dd408c4b19f407bc22e42eb32ccb9256e5865",
+        "rev": "b0862a125da8fe5d179633d6cc7aed57d5316871",
         "type": "github"
       },
       "original": {
@@ -399,11 +399,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711001935,
-        "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
+        "lastModified": 1713297878,
+        "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
+        "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
         "type": "github"
       },
       "original": {
@@ -437,14 +437,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "searx-randomizer": "searx-randomizer"
+        "searx-randomizer": "searx-randomizer",
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1710502118,
-        "narHash": "sha256-kPzvCwGVuLlPDVRD35dMnudWPpEzRXfU/9DHsG12PaY=",
+        "lastModified": 1713347628,
+        "narHash": "sha256-lZh6CzsTICUuCFLKicSHsnP7izUJORIIkJP5bg3ftNU=",
         "owner": "schizofox",
         "repo": "schizofox",
-        "rev": "8dde2033a6f448c48a48d4d0aeb22bf2da840b7d",
+        "rev": "7821c5e69ff3dc694c6164bbf42394983ab5ed9d",
         "type": "github"
       },
       "original": {
@@ -491,6 +492,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "viper-nix-common": {
       "inputs": {
         "nixpkgs-lib": [
diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix
index 4f722d9..539e9db 100644
--- a/hosts/navi/default.nix
+++ b/hosts/navi/default.nix
@@ -30,7 +30,7 @@
       supportedFilesystems = ["ntfs"];
       kernelModules = ["kvm-intel" "snd-seq" "snd-rawmidi" "bridge" "hid_logitech_dj" "hid_logitech_hidpp"];
       kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-      # extraModulePackages = [ config.boot.kernelPackages.rtl8821ce ];
+      #extraModulePackages = [ config.boot.kernelPackages.rtl8821ce ];
       loader = {
         systemd-boot = {
           enable = true;
@@ -122,16 +122,15 @@
     '';
 
     home-manager.users.tzlil = {
-      services.gnome-keyring = {
-        enable = true; # for nheko
-        components = ["secrets"];
-      };
+      # services.gnome-keyring = {
+      # enable = true; # for nheko
+      # components = ["secrets"];
+      # };
       home.packages = [
-        pkgs.nheko
         pkgs.keepassxc
         pkgs.gtkcord4
         pkgs.cmst
-        pkgs.nheko
+        pkgs.cinny-desktop
 
         # (pkgs.stdenv.mkDerivation rec {
         #   name = "pragmata";
@@ -180,7 +179,7 @@
         # })
         # pkgs.apl386
 
-        (pkgs.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb]))
+        #(pkgs.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb]))
 
         (pkgs.discord.override {
           withOpenASAR = true;
diff --git a/mixins/sway.nix b/mixins/sway.nix
index a3eaf4b..9c452b5 100644
--- a/mixins/sway.nix
+++ b/mixins/sway.nix
@@ -11,7 +11,7 @@
         enable = true;
         settings = {
           mainBar = {
-            modules-left = ["sway/workspaces" "sway/mode" "wlr/taskbar"];
+            modules-left = ["sway/workspaces" "sway/mode"];
             modules-center = ["sway/window"];
             modules-right = ["mpd" "temperature" "battery" "clock"];
 
@@ -22,6 +22,24 @@
           };
         };
       };
+
+      programs.swayr = {
+        enable = true;
+        settings = {
+          menu = {
+            executable = "${lib.getExe pkgs.kickoff}";
+            args = [
+              "-p={prompt}"
+              "--from-stdin"
+              "--stdout"
+            ];
+
+            # dont even fucking ask
+          };
+          format.window_format = "{app_name} - {title} on workspace {workspace_name} = #s:[con_id={id}] focuss";
+        };
+	systemd.enable = true;
+      };
       services.mako.enable = true;
       home.packages = with pkgs; [
         wf-recorder
@@ -95,9 +113,9 @@
         wrapperFeatures.gtk = true;
         config = rec {
           fonts = {
-            names = ["Iosevka"];
+            names = ["APL385 Unicode"];
             style = "Regular";
-            size = 11.0;
+            size = 14.0;
           };
           output = {
             "DP-1" = {
@@ -137,6 +155,7 @@
             "${modifier}+Return" = "exec $term";
             "${modifier}+q" = "kill";
             "${modifier}+d" = "exec ${lib.getExe pkgs.kickoff}";
+            "${modifier}+r" = "exec ${lib.getExe pkgs.swayr} switch-window";
             "${modifier}+Shift+c" = "reload";
             "${modifier}+Shift+q" = "exec swaynag -t warning -m 'you sure?' -B 'yes' 'swaymsg exit' -s 'no'";
             "${modifier}+Shift+p" = "exec systemctl poweroff";