mess migration

flake.lock

@@ -320,11 +320,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
         "type": "github"
       },
       "original": {
@@ -497,11 +497,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1692203287,
-        "narHash": "sha256-qJdU6fyR7bYFesnxqaNCKVLviWUJgI9OcRx2i9L79gw=",
+        "lastModified": 1692817399,
+        "narHash": "sha256-gbLru0aup6iI0JnDGMQd1jsb8H6IJUNr/Xln3/ouAZc=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "56ccaedffbb8011e36012278e2a4861a8d435a60",
+        "rev": "c9694f680f97823ac9b893239a78bf45bfee0403",
         "type": "github"
       },
       "original": {
@@ -517,11 +517,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692260837,
-        "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=",
+        "lastModified": 1692763155,
+        "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a94c1a59737783c282c4031555a289c28b961e4",
+        "rev": "6a20e40acaebf067da682661aa67da8b36812606",
         "type": "github"
       },
       "original": {
@@ -542,11 +542,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692214333,
-        "narHash": "sha256-L2CAAvr/HYE5P/XaNad1laQQlXXOOv4BeS7Nk6uc574=",
+        "lastModified": 1693000981,
+        "narHash": "sha256-1FnbFJ6vWfCmucD74o+KjnASEySeyhCKlE54ldp5PwU=",
         "owner": "JakeStanger",
         "repo": "ironbar",
-        "rev": "e5281e96193a2f42d52a0eb736473cdb378dd243",
+        "rev": "6c38ff29c4b4c74d8200ad41d8b0d4075952aade",
         "type": "github"
       },
       "original": {
@@ -611,11 +611,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691897365,
-        "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
+        "lastModified": 1692503351,
+        "narHash": "sha256-FdG0wnizM9mAUgi58KP1tXaX4ogVooPDS6VwsGEqZ9s=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "f4d70d098f066a30c7087144063dca179495f7d6",
+        "rev": "4becac130db930e9de8c3fe58bfa245c119b9eeb",
         "type": "github"
       },
       "original": {
@@ -724,11 +724,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1692207601,
-        "narHash": "sha256-tfPGNKQcJT1cvT6ufqO/7ydYNL6mcJClvzbrzhKjB80=",
+        "lastModified": 1692986144,
+        "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b30c68669df77d981ce4aefd6b9d378563f6fc4e",
+        "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
         "type": "github"
       },
       "original": {
@@ -756,11 +756,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1692174805,
-        "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
+        "lastModified": 1693003285,
+        "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
+        "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
         "type": "github"
       },
       "original": {
@@ -772,11 +772,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1692275917,
-        "narHash": "sha256-PcUYd0Si3tFsxnT57IfiLy/s5VCPXuUoFK+SvQ7kexI=",
+        "lastModified": 1693057602,
+        "narHash": "sha256-EGNBYNeEO9pcF8e8QSt+SyJf4goBpC1E7D69hFJ3r70=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b7fcbcbbdbf2bbbda6965cbcc8f85542c314167c",
+        "rev": "4c58adf6f6d01ee9392343f578f8c701aa0373b5",
         "type": "github"
       },
       "original": {
@@ -1009,11 +1009,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692238117,
-        "narHash": "sha256-gOoxig/GBuGOYWqE3+7OMrgPVduxjjsbo4qikRb1h3s=",
+        "lastModified": 1693015707,
+        "narHash": "sha256-SFr93DYn502sVT9nB5U8/cKg1INyEk/jCeq8tHioz7Y=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3e0e4ec062706ebba759795ad18ad72ad69d41f3",
+        "rev": "e90223633068a44f0fb62374e0fa360ccc987292",
         "type": "github"
       },
       "original": {

flake.nix

@@ -70,9 +70,40 @@
     forAllSystems = nixpkgs.lib.genAttrs [
       "x86_64-linux"
     ];
+    overlays = import ./overlay.nix {inherit inputs;};
+
   in rec {
     overlays = import ./overlay.nix {inherit inputs;};
 
+    homeConfigurations = {
+      "twitchin" = home-manager.lib.homeManagerConfiguration {
+        pkgs = (import nixpkgs {
+          system = "x86_64-linux";
+          overlays = [
+            inputs.nur.overlay
+            outputs.overlays.additions
+            outputs.overlays.pkg-sets
+            outputs.overlays.wlroots
+            outputs.overlays.sway-unwrapped
+            outputs.overlays.sway
+            inputs.nix-rice.overlays.default
+            outputs.overlays.rice
+            inputs.helix.overlays.default
+            inputs.persway.overlays.default
+            # inputs.eww.overlays.default
+          ];
+          config = {
+            allowUnfree = true;
+            allowUnfreePredicate = _: true;
+          };
+        });
+        extraSpecialArgs = {inherit inputs outputs;};
+        modules = [
+          ./home/twitchin.nix
+        ];
+      };
+    };
+
     nixosConfigurations = {
       "quiver" = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";

home/dots/wlogout/layout

@@ -30,9 +30,9 @@
     "keybind" : "r"
   },
   {
-    "label" : "hibernate",
-    "action" : "systemctl hibernate",
-    "text" : "Hibernate",
-    "keybind" : "h"
+    "label" : "windows",
+    "action" : "systemctl reboot --boot-loader-entry=auto-windows",
+    "text" : "Windows",
+    "keybind" : "w"
   }
 ]

home/dots/wlogout/style.css

@@ -42,3 +42,7 @@ button:focus, button:active, button:hover {
 #reboot {
     background-image: image(url("/usr/share/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png"));
 }
+
+#windows {
+    background-image: image(url("#WINLOGO"))
+}

home/dots/zsh

@@ -2,12 +2,12 @@
 
 la_culr()
 {
-     exa -lha --group-directories-first --icons --color=always $@ | culr -t 80 -o roygbiv-split
+     eza -lha --group-directories-first --icons --color=always $@ | culr -t 80 -o roygbiv-split
 }
 
 ls_culr()
 {
-     exa -lh --group-directories-first --icons --color=always $@ | culr -t 80 -o roygbiv-split
+     eza -lh --group-directories-first --icons --color=always $@ | culr -t 80 -o roygbiv-split
 }
 
 ps_culr()

home/home.nix

@@ -36,11 +36,9 @@ in {
       fzf
       zoxide
       zellij
-      glib # for gsettings
       grim
       slurp
-      swaybg
-      wlogout
+      
       libnotify
       xorg.xrdb
       swayidle
@@ -55,7 +53,7 @@ in {
       swayosd
       fuzzel
 
-      kdeconnect
+      # kdeconnect
       keepassxc
       git-credential-keepassxc
 
@@ -63,6 +61,8 @@ in {
 
       mpv
 
+      river
+
       # libsForQt5.qtstyleplugin-kvantum
 
       gtk-engine-murrine
@@ -88,6 +88,10 @@ in {
 
   services.udiskie.enable = true;
 
+  programs.vscode = {
+    enable = true;
+  };
+
   programs.ironbar = with pkgs.rice; {
     enable = true;
     config = {
@@ -200,9 +204,14 @@ in {
         };
       };
       startup = with pkgs; [
-        {command = "${lib.getExe mullvad} connect";}
-        {command = "${lib.getExe xorg.xrdb} -l ~/.Xresources";}
-        {command = "${lib.getExe flashfocus} -o 0.95 -t 175 -n 30 --no-flash-fullscreen -l on_open_close";}
+        {command = "${lib.getExe' keepassxc "keepassxc"}";}
+        {command = "${lib.getExe' ckb-next "ckb-next"} -c -b";}
+        {command = "${lib.getExe' mullvad "mullvad"} connect";}
+        {command = "${lib.getExe' xorg.xrdb "xrdb"} -l ~/.Xresources";}
+        {command = "${lib.getExe' flashfocus "flashfocus"} -o 0.97 -t 175 -n 30 --no-flash-fullscreen -l on_open_close";}
+        {command = "${lib.getExe' glib.bin "gsettings"} set org.gnome.desktop.interface gtk-theme '${rice.gtk-theme.name}'";}
+        {command = "${lib.getExe' glib.bin "gsettings"} set org.gnome.desktop.interface font-name '${rice.fonts.sans.name}'";}
+        {command = "${lib.getExe' glib.bin "gsettings"} set org.gnome.desktop.interface icon-theme '${rice.icons.name}'";}
       ];
       terminal = "kitty";
       modifier = "Mod4";
@@ -304,21 +313,23 @@ in {
     builtins.mapAttrs (name: cmd: {
       Unit = {
         Description = "${name}";
+        Requires = ["sway-session.target"];
       };
       Service = {
         ExecStart = cmd;
       };
       Install = {
-        WantedBy = ["graphical-session.target"];
+        WantedBy = ["sway-session.target"];
       };
     })
     {
       swaybg = "${lib.getExe swaybg} -i ${rice.bg.image} -m fill";
-      ckb-next = "${lib.getExe ckb-next} -c -b";
-      swayosd = "${lib.getExe swayosd} --max-volume 100";
-      keepassxc = "${lib.getExe keepassxc}";
+      # QT APPS CANT THEME PROPERLY HOW EMBARASSING
+      # keepassxc = "${lib.getExe' keepassxc "keepassxc"}";
+      # ckb-next = "${lib.getExe' ckb-next "ckb-next"} -c -b";
+      swayosd = "${lib.getExe' swayosd "swayosd"} --max-volume 100";
       swaync = "${lib.getExe swaynotificationcenter}";
-      persway = "${lib.getExe persway} daemon -d spiral -f \"[tiling] opacity 0.98; opacity 1\"";
+      persway = "${lib.getExe' persway "persway"} daemon -d spiral";
       # PYTHON APP CANT RUN AS SYSTEMD SERVICE HOW EMBARASSING
       # flashfocus = "${lib.getExe flashfocus} -o 0.95 -t 175 -n 30 --no-flash-fullscreen -l on_open_close";
     };
@@ -406,6 +417,7 @@ in {
         "#BTNCOL"
         "#BTNBG"
         "#BTNFOCUSBG"
+#        "#WINLOGO"
       ]
       [
         "${pkgs.wlogout}/share/wlogout"
@@ -414,6 +426,11 @@ in {
         bright.yellow
         util.bg
         normal.black
+#        (builtins.path {
+#          name = "winlogo";
+#          path = ./winlogo.png;
+#          sha256 = "7c1ff96b553c7a7ca3a7b7cf8efe830ab7feea92355aed288a10ee7347c24108";
+#        })
       ]
       (builtins.readFile dots/wlogout/style.css));
   };

home/twitchin.nix

@@ -0,0 +1,20 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./home.nix
+  ];
+  home.packages = with pkgs; [
+    nicotine-plus
+  ];
+
+  home = {
+    username = "twitchin";
+    homeDirectory = "/home/twitchin";
+  };
+}

overlay.nix

@@ -41,5 +41,9 @@
       withGtkWrapper = true;
     };
   };
-  swayfx = final: prev: {swayfx = final.unstable.swayfx.override {sway-unwrapped = final.sway-unwrapped;};};
+  river = final: prev: {
+    river = final.unstable.river.override {
+      wlroots = final.wlroots;
+    };
+  };
 }

rice.nix

@@ -100,7 +100,7 @@ in rec {
       image = builtins.path {
         name = "wallpaper";
         path = ./wallpaper.png;
-        sha256 = "8d944e1ca6c3769060b715467a0dbe0f83ee99ff8b59aac80c2cacb7e838b7f9";
+        sha256 = "a98b32664ab456d088225a19c0fc7e672a8fccd6a30129fdb2ff11d25e766b17";
       };
     };
   }; # /rice

system/configuration.nix

@@ -31,7 +31,7 @@
   nix = {
     registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
     settings = {
-      trusted-users = ["bolt"];
+      trusted-users = ["bolt" "plank"];
       experimental-features = "nix-command flakes";
       substitute = true;
       substituters = ["https://anyrun.cachix.org" "https://jakestanger.cachix.org"];
@@ -146,10 +146,8 @@
     home-manager
     cachix
 
-    ark
-
     curl
-    exa
+    eza
     swaybg
 
     git
@@ -201,6 +199,8 @@
     };
   };
 
+  systemd.services."user@".serviceConfig.Delegate = "memory pids cpu cpuset";
+
   security.pam.services.gtklock = {
     text = ''
       auth include login

system/quiver.nix

@@ -16,7 +16,7 @@
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd" "i2c-dev"];
   boot.kernelParams = [
-    "nvidia_drm.modeset=1"
+   "nvidia_drm.modeset=1"
     "mitigations=off"
     "acpi_enforce_resources=lax"
     "preempt=full"
@@ -57,9 +57,14 @@
   virtualisation = {
     podman = {
       enable = true;
-      dockerCompat = true;
+      # dockerSocket.enable = true;
+      # enableNvidia = true;
       defaultNetwork.settings.dns_enabled = true;
     };
+    docker = {
+      enable = true;
+      enableNvidia = true;
+    };
   };
 
   services.minidlna = {
@@ -94,8 +99,6 @@
   hardware.ckb-next.enable = true;
 
   environment.systemPackages = with pkgs; [
-    ckb-next
-    openrgb
     wl-clipboard
     wl-clipboard-x11
     xclip
@@ -104,13 +107,13 @@
   networking.hostName = "quiver"; # Define your hostname.
   users.users.bolt = {
     isNormalUser = true;
-    extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
+    extraGroups = ["wheel" "podman" "docker"]; # Enable ‘sudo’ for the user.
   };
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/d227445f-6120-4768-8e1b-011f097505c1";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/b993b463-c131-4ef1-9aba-0e3eadaa2f9a";
+      fsType = "btrfs";
+    };
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/6B75-AF9F";
@@ -123,6 +126,11 @@
     options = ["rw" "uid=1000" "gid=100"];
   };
 
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/9c006925-e0e9-4165-bc0c-508ae2d1bfce"; }
+    ];
+
+
   networking.nftables.enable = true;
   networking.firewall = {
     allowedUDPPorts = [1900];