apps/rebuild.nix

@@ -6,9 +6,9 @@
     echo ${pkgs.system}
     SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
     if [ "$SYSTEM" == "darwin" ]; then
-        sudo darwin-rebuild switch --flake ${builtins.toString ../.}
+        darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
     else
-        doas nixos-rebuild switch --flake ${builtins.toString ../.}
+        nixos-rebuild switch --flake github:nmasur/dotfiles
     fi
   '');
 

modules/nixos/graphical/default.nix

@@ -1,14 +1,7 @@
 { lib, ... }: {
 
-  imports = [
+  imports =
-    ./dunst.nix
+    [ ./xorg.nix ./fonts.nix ./i3.nix ./polybar.nix ./picom.nix ./rofi.nix ];
-    ./fonts.nix
-    ./i3.nix
-    ./picom.nix
-    ./polybar.nix
-    ./rofi.nix
-    ./xorg.nix
-  ];
 
   options = {
 

modules/nixos/graphical/dunst.nix

@@ -1,31 +0,0 @@
-{ config, ... }:
-
-{
-
-  config = {
-
-    home-manager.users.${config.user}.services.dunst = {
-      enable = true;
-      settings = {
-        global = {
-          width = 300;
-          height = 200;
-          offset = "30x50";
-          origin = "top-right";
-          transparency = 0;
-          padding = 20;
-          horizontal_padding = 20;
-          frame_color = config.theme.colors.base03;
-        };
-
-        urgency_normal = {
-          background = config.theme.colors.base00;
-          foreground = config.theme.colors.base05;
-          timeout = 10;
-        };
-      };
-    };
-
-  };
-
-}

modules/nixos/graphical/fonts.nix

@@ -22,7 +22,6 @@ in {
       programs.rofi.font = "Hack Nerd Font 14";
       programs.alacritty.settings.font.normal.family = fontName;
       programs.kitty.font.name = fontName;
-      services.dunst.settings.global.font = "Hack Nerd Font 14";
     };
 
   };

modules/nixos/graphical/i3.nix

@@ -128,10 +128,6 @@ in {
             "${modifier}+Shift+q" = ''
               exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
             "${modifier}+Shift+x" = "exec ${lockCmd}";
-            "${modifier}+Mod1+h" =
-              "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} && ${pkgs.libnotify}/bin/notify-send --transient --expire-time 3000 \"Rebuilt home.\" || read'";
-            "${modifier}+Mod1+r" =
-              "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} && ${pkgs.libnotify}/bin/notify-send --transient --expire-time 3000 \"Rebuilt NixOS.\" || read'";
 
             # Window options
             "${modifier}+q" = "kill";

modules/nixos/graphical/polybar.nix

@@ -161,7 +161,7 @@
           "module/date" = {
             type = "internal/date";
             interval = 1;
-            date = "%d %b %l:%M %p";
+            date = "%d %b  %l:%M %p";
             date-alt = "%Y-%m-%d %H:%M:%S";
             label = "%date%";
             label-foreground = config.theme.colors.base0A;