flake.lock

@@ -59,11 +59,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1741481578,
+        "lastModified": 1739936662,
-        "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
+        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
+        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
         "type": "github"
       },
       "original": {
@@ -403,11 +403,11 @@
         "zig2nix": "zig2nix"
       },
       "locked": {
-        "lastModified": 1741594465,
+        "lastModified": 1741473443,
-        "narHash": "sha256-8a/QIgNwV8VGn8JIiACmVVEdue+U3juiMSAO1DEUTC4=",
+        "narHash": "sha256-H+rS9UDb1Qd0bTUxppNgiIHLzr4sR/LnDox4VhR5Q1w=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "95daca616db5c24d7bb37fd5a3ac2f8762bb4ead",
+        "rev": "d3fd2b02e71f3eaecd310b246ee64a26a59b78e3",
         "type": "github"
       },
       "original": {
@@ -490,11 +490,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1741815977,
+        "lastModified": 1741370148,
-        "narHash": "sha256-zRPJMgKBvLBNVlPEMpkjEYtd2jKbHE6AlqT9bL5m/yQ=",
+        "narHash": "sha256-nzGqv+4teMbOjhylRCfGsqH7XFLt5m+uwJHgGA0YpUQ=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "1bd7a3901cf73a9219470dafc65f3c7119e96cc0",
+        "rev": "dc4761ad3a09a1cc9a3219d75765ff098fb203af",
         "type": "github"
       },
       "original": {
@@ -537,11 +537,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741791118,
+        "lastModified": 1741461731,
-        "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=",
+        "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18780912345970e5b546b1b085385789b6935a83",
+        "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44",
         "type": "github"
       },
       "original": {
@@ -626,11 +626,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1741788549,
+        "lastModified": 1741461862,
-        "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=",
+        "narHash": "sha256-TNTtpDHoNB+wOEfypkGTu2zC0wHUwbabQo4HyU53Yok=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10",
+        "rev": "d30cc19d253a3db784ad10c3084f58cbb52d325a",
         "type": "github"
       },
       "original": {
@@ -988,11 +988,11 @@
         "yants": "yants"
       },
       "locked": {
-        "lastModified": 1741798076,
+        "lastModified": 1741379880,
-        "narHash": "sha256-zQh8FysFtZ0QVGNxDkpO50be9N+8lvkUgwpkMua1kK8=",
+        "narHash": "sha256-DKlMDfJpiqlwb4X4+3BBITNsMa8PvwzxPBexwPdrhCI=",
         "owner": "ngi-nix",
         "repo": "ngipkgs",
-        "rev": "ed15bd021f36f9396e4d60664599de187f267b2f",
+        "rev": "716f0f56604f76aa731b4dd47386028a91a7a0c5",
         "type": "github"
       },
       "original": {
@@ -1008,11 +1008,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1741691385,
+        "lastModified": 1741432127,
-        "narHash": "sha256-Zjs3cBTVm4GLjjLgdi9XS/7nEdjjciKPj2EFOLOrNcE=",
+        "narHash": "sha256-JrN9MWJLVVEjVYINDX0NHI2U91/7qSywm6m6mGKwB0E=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "5af413f4e97073783ed2dc11fd134ffc7771414d",
+        "rev": "bf3d41b9fc89883823ce9fadbec1b44f2cdd1fac",
         "type": "github"
       },
       "original": {
@@ -1071,11 +1071,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1741600792,
+        "lastModified": 1741332913,
-        "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
+        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
+        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
         "type": "github"
       },
       "original": {
@@ -1103,11 +1103,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1741513245,
+        "lastModified": 1741246872,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
         "type": "github"
       },
       "original": {
@@ -1119,11 +1119,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1741513245,
+        "lastModified": 1741379970,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
+        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
+        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
         "type": "github"
       },
       "original": {
@@ -1158,11 +1158,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1741827850,
+        "lastModified": 1741473895,
-        "narHash": "sha256-wTZexZxoIi8pvEvYaE0xfDfvq1KQgzk0/BipXumYv8M=",
+        "narHash": "sha256-mWiCOdvGkDVJO6C9OaXDpYuKUJocyeZhtWP7QNqS2Zs=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8a38b29f38afb374c33123fd0d0128cab36a1ea4",
+        "rev": "3c1d774501d2300c51ce37ea6d1405d5ea12e740",
         "type": "github"
       },
       "original": {
@@ -1351,11 +1351,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741573199,
+        "lastModified": 1740882709,
-        "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
+        "narHash": "sha256-VC+8GxWK4p08jjIbmsNfeFQajW2lsiOR/XQiOOvqgvs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
+        "rev": "f4d5a693c18b389f0d58f55b6f7be6ef85af186f",
         "type": "github"
       },
       "original": {
@@ -1415,11 +1415,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741644481,
+        "lastModified": 1741043164,
-        "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=",
+        "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e653d71e82575a43fe9d228def8eddb73887b866",
+        "rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
         "type": "github"
       },
       "original": {
@@ -1676,11 +1676,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1741760227,
+        "lastModified": 1741418166,
-        "narHash": "sha256-5yZ3FQZFG0DSssr8NRa+JWGOojHLDFG2L+icNVnj+tw=",
+        "narHash": "sha256-9/KZCzO2V2DgNp5225dvNjWFUZDSRNc52wV4a/tU95Y=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "abfbd1cd9f0dd428d134f257ec89c25dac842b65",
+        "rev": "31177fd1fd71500e6a30edee60a122f78e5e7424",
         "type": "github"
       },
       "original": {
@@ -1699,11 +1699,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1741823056,
+        "lastModified": 1741472240,
-        "narHash": "sha256-/NUosorAbmRSwufdk/cY+8h//43gTNxk2W9cSulJ3pc=",
+        "narHash": "sha256-STuoLQxDC9b7j26rNSfVNnX19jxI7P2MzoMYqA0Khfs=",
         "owner": "zed-industries",
         "repo": "zed",
-        "rev": "0081b816fecf59ae7351a14eb7249e600389d508",
+        "rev": "ed6bf7f161c6af6e10354faacb8b643a55c80b27",
         "type": "github"
       },
       "original": {

flake.nix

@@ -98,7 +98,7 @@
             deimos = inputs.self.lib.mkLinuxSystem [
               ./systems/deimos
               ./profiles/user0
-              # ./profiles/user1
+              ./profiles/user1
               config.nixosModules.deimos
               config.nixosModules.core
               config.nixosModules.mantle

modules/home/default.nix

@@ -114,69 +114,45 @@ in
           inherit (modules)
             cli
             brave
-            floorp
+            emulators
+            firefox
             tor
-            ghostty
+            code
-            prismLauncher
+            gaming
-            steam
+            media
-            zed
+            messaging
-            feishin
-            obsidian
-            libreOffice
-            okular
-            zathura
-            kolourPaint
-            imageViewing
-            obsStudio
-            daVinci
-            mpv
-            freetube
-            dissent
-            discordCanary
-            element
-            signal
             sharing
-            bitwarden
+            tools
-            emote
+            ;
-            flameshot
+        };
-            gnomeCalculator
+      };
-            scrcpy
+      "${deimos.name}-${user1}" = {
-            systemMonitor
+        imports = builtins.attrValues {
-            usbImager
+          inherit (modules)
-            virtManager
+            cli
-            hypr
+            brave
-            wayland
+            ghostty
-            theming
+            zed
-            polychromatic
+            gaming
-            dolphin
+            spotify
+            docs
+            mpv
+            kolourPaint
+            discord
+            signal
+            scrcpy
+            bitwarden
+            emote
+            desktop
             ;
         };
       };
-      # "${deimos.name}-${user1}" = {
-      #   imports = builtins.attrValues {
-      #     inherit (modules)
-      #       cli
-      #       brave
-      #       ghostty
-      #       zed
-      #       gaming
-      #       spotify
-      #       docs
-      #       mpv
-      #       kolourPaint
-      #       discord
-      #       signal
-      #       scrcpy
-      #       bitwarden
-      #       emote
-      #       desktop
-      #       ;
-      #   };
-      # };
       "${charon.name}-${user1}" = {
         imports = builtins.attrValues {
           inherit (modules)
             cli
+            catppuccin
+            gtk
             brave
             ghostty
             zed

modules/home/gui/desktop/hypr/land/config/bind-user0.nix

@@ -24,6 +24,8 @@ let
     "5, workspace, 5"
     # Windows
     "Tab, killactive"
+    "O, splitratio, 0.33"
+    "F, splitratio, -0.33"
     # Window Focus
     "C, movefocus, l"
     "A, movefocus, u"
@@ -43,8 +45,6 @@ let
     "A, movewindow, u"
     "E, movewindow, d"
     "I, movewindow, r"
-    "equal, splitratio, 0.33"
-    "minus, splitratio, -0.33"
     # Quick Action
     "T, exec, ghostty"
     "S, exec, flameshot gui"

modules/home/gui/desktop/wayland/waybar/config/settings.nix

@@ -1,13 +1,8 @@
-{ flake, config, ... }:
+{ flake, ... }:
 let
   inherit (flake.config.people)
     user0
-    user1
-    user2
     ;
-
-  user = config.home.username;
-  userConfig = flake.config.people.users.${user};
 in
 {
   mainBar = {
@@ -35,7 +30,6 @@ in
       "disk"
       "pulseaudio"
       # "network"
-      "battery"
       "clock"
     ];
 
@@ -159,29 +153,12 @@ in
     };
 
     "custom/weather" = {
-      exec = "/home/${user}/.config/scripts/get_weather.sh Winnipeg";
+      exec = "/home/${user0}/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg";
       return-type = "json";
       format = "{}";
       tooltip = true;
       interval = 3600;
     };
-    battery = {
-      format = "{icon} {capacity}%";
-      format-alt = "{icon} {time}";
-      format-charging = " {capacity}%";
-      format-icons = [
-        ""
-        ""
-        ""
-        ""
-        ""
-      ];
-      format-plugged = " {capacity}%";
-      states = {
-        critical = 15;
-        warning = 30;
-      };
-    };
   };
 }
 # https://unicodes.jessetane.com/

modules/home/gui/desktop/wayland/waybar/config/style.nix

@@ -100,12 +100,6 @@ in
     #clock {
     }
 
-    #battery {
-        font-size: ${custom.font_size};
-        color: #${custom.text_color};
-        padding-right: 10px;
-    }
-
     #custom-launcher {
         font-size: 20px;
         color: #${custom.text_color};

modules/home/gui/desktop/wayland/waybar/default.nix

@@ -6,7 +6,7 @@
 }:
 let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) { inherit config flake; };
+  settingsPath = import (configPath + /settings.nix) { inherit flake; };
   stylePath = import (configPath + /style.nix) { inherit config flake; };
 in
 {

modules/home/gui/desktop/wayland/wpaperd/default.nix

@@ -3,7 +3,7 @@
     enable = true;
     settings = {
       "default" = {
-        path = "~/.config/wallpaper";
+        path = "~/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/wpaperd/wallpaper";
         apply-shadow = true;
         duration = "1m";
         sorting = "random";

modules/nixos/core/doas/default.nix

@@ -1,8 +1,4 @@
-{
+{ flake, config, ... }:
-  flake,
-  config,
-  ...
-}:
 let
   inherit (flake.config.people)
     user0
@@ -15,25 +11,8 @@ let
   hostname = config.networking.hostName;
   mars = devices.mars.name;
   ceres = devices.ceres.name;
-  venus = devices.venus.name;
+  venus = devices.venus.names;
   charon = devices.charon.name;
-  deimos = devices.deimos.name;
-
-  userLogic =
-    if
-      builtins.elem hostname [
-        mars
-        deimos
-        ceres
-      ]
-    then
-      user0
-    else if hostname == charon then
-      user1
-    else if hostname == venus then
-      user2
-    else
-      "";
 in
 {
   security = {
@@ -44,7 +23,18 @@ in
           keepEnv = true;
           noPass = true;
           users = [
-            userLogic
+            (
+              if hostname == mars then
+                user0
+              else if hostname == ceres then
+                user0
+              else if hostname == charon then
+                user1
+              else if hostname == venus then
+                user2
+              else
+                ""
+            )
           ];
         }
       ];

modules/nixos/core/ssh/default.nix

@@ -17,22 +17,15 @@ let
     ;
   hostname = config.networking.hostName;
   mars = devices.mars.name;
-  deimos = devices.deimos.name;
   ceres = devices.ceres.name;
   venus = devices.venus.name;
   charon = devices.charon.name;
 
   userLogic =
-    if
+    if hostname == mars then
-      builtins.elem hostname [
+      user0
-        mars
+    else if hostname == ceres then
-        deimos
-        ceres
-      ]
-    then
       user0
-    else if hostname == charon then
-      user1
     else if hostname == venus then
       user2
     else

modules/nixos/default.nix

@@ -40,17 +40,6 @@ in
       };
     };
 
-    charon = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          hypr
-          wayland
-          flatpak
-          xserver
-          ;
-      };
-    };
-
     ceres = {
       imports = builtins.attrValues {
         inherit (modules)

modules/nixos/desktop/wayland/greetd/default.nix

@@ -7,14 +7,7 @@
 let
   inherit (flake.config.people)
     user0
-    user1
-    user2
     ;
-  inherit (flake.config.machines) devices;
-  venus = devices.venus.name;
-  charon = devices.charon.name;
-
-  host = config.networking.hostName;
 in
 {
   services = {
@@ -25,13 +18,7 @@ in
         let
           default_session = {
             command = "${lib.meta.getExe config.programs.hyprland.package}";
-            user =
+            user = user0;
-              if host == charon then
-                user1
-              else if host == venus then
-                user2
-              else
-                user0;
           };
         in
         {

modules/nixos/desktop/wayland/regreet/default.nix

@@ -11,7 +11,7 @@ let
 in
 {
   programs.regreet = {
-    enable = false;
+    enable = true;
     package = pkgs.greetd.regreet;
     # settings = {
     #   appearance = {

modules/nixos/sops/default.nix

@@ -1,12 +1,7 @@
-{
+{ flake, config, ... }:
-  flake,
-  config,
-  ...
-}:
 let
   inherit (flake.config.people)
     user0
-    user1
     user2
     ;
   inherit (flake.config.machines)
@@ -17,19 +12,12 @@ let
   ceres = devices.ceres.name;
   venus = devices.venus.name;
   charon = devices.charon.name;
-  deimos = devices.deimos.name;
 
   userLogic =
-    if
+    if hostname == mars then
-      builtins.elem hostname [
+      user0
-        mars
+    else if hostname == ceres then
-        deimos
-        ceres
-      ]
-    then
       user0
-    else if hostname == charon then
-      user1
     else if hostname == venus then
       user2
     else

profiles/user0/default.nix

@@ -62,14 +62,6 @@ in
           "./.config/vesktop/themes/macchiato-theme.css" = {
             source = ./files/themes/vesktop/macchiato-theme.css;
           };
-          "./.config/scripts/get_weather.sh" = {
-            source = ./files/get_weather.sh;
-            executable = true;
-          };
-          ".config/wallpaper" = {
-            source = ./files/wallpaper;
-            recursive = true;
-          };
         };
         sessionVariables = {
           VISUAL = lib.getExe pkgs.zed-editor;

profiles/user1/default.nix

@@ -38,14 +38,6 @@ in
           "./justfile" = {
             source = ./files/justfile;
           };
-          "./.config/scripts/get_weather.sh" = {
-            source = ./files/get_weather.sh;
-            executable = true;
-          };
-          ".config/wallpaper" = {
-            source = ./files/wallpaper;
-            recursive = true;
-          };
         };
         sessionVariables = { };
       };

profiles/user1/files/get_weather.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-for i in {1..5}
-do
-    text=$(curl -s "https://wttr.in/$1?format=1")
-    if [[ $? == 0 ]]
-    then
-        text=$(echo "$text" | sed -E "s/\s+/ /g")
-        tooltip=$(curl -s "https://wttr.in/$1?format=4")
-        if [[ $? == 0 ]]
-        then
-            tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g")
-            echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}"
-            exit
-        fi
-    fi
-    sleep 2
-done
-echo "{\"text\":\"error\", \"tooltip\":\"error\"}"

systems/deimos/config/filesystem.nix

@@ -75,7 +75,7 @@ in
 
   systemd.tmpfiles.rules = [
     "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
-    # "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
+    "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
   ];
 
   services.udisks2.enable = true;