Sun Jun 2 02:50:05 PM CEST 2024

NixOS/home/common.nix

@@ -3,50 +3,20 @@
 {
   imports = [
     ./zsh
+    ./git
     ./nvim
     ./email
-    ./rofi
     ./lf
-    (import ./hyprland { inherit inputs pkgs; })
-    (import ./waybar { inherit inputs pkgs; })
   ];
 
   home.stateVersion = "24.11";
   targets.genericLinux.enable = true;
   nixpkgs.config.allowUnfree = true;
-
+  programs.home-manager.enable = true;
   home.packages = with pkgs; [
     htop
-    mailcap
   ];
 
-  home.file = {
-    ".mailcap".text = "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
-  };
-
-  programs.bash.enable = true;
-  programs.home-manager.enable = true;
-  programs.git = {
-    enable = true;
-    userName = "Thomas Avé";
-    userEmail = "email@thomasave.be";
-    aliases = {
-      s = "status";
-      a = "add";
-    };
-    extraConfig = {
-      credentials.helper = "store";
-      pull.rebase = false;
-      push.autoSetupRemove = true;
-      init.defaultBranch = "master";
-      diff.noprefix = true;
-      color.ui = "auto";
-      core = {
-        excludesfile = "~/.gitignore";
-        editor = "${pkgs.neovim}/bin/nvim";
-      };
-    };
-  };
 
   home.sessionVariables = {
     XDG_CONFIG_HOME = "${config.xdg.configHome}";

NixOS/home/email/default.nix

@@ -1,6 +1,13 @@
 { config, pkgs, ... }:
 
 {
+  home.file = {
+    ".mailcap".text = "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
+  };
+  home.packages = with pkgs; [
+    mailcap
+  ]
+
   programs.notmuch = {
     enable = true;
     extraConfig = {

NixOS/home/git/default.nix

@@ -0,0 +1,23 @@
+{
+  programs.git = {
+    enable = true;
+    userName = "Thomas Avé";
+    userEmail = "email@thomasave.be";
+    aliases = {
+      s = "status";
+      a = "add";
+    };
+    extraConfig = {
+      credentials.helper = "store";
+      pull.rebase = false;
+      push.autoSetupRemove = true;
+      init.defaultBranch = "master";
+      diff.noprefix = true;
+      color.ui = "auto";
+      core = {
+        excludesfile = "~/.gitignore";
+        editor = "${pkgs.neovim}/bin/nvim";
+      };
+    };
+  };
+}

NixOS/home/hyprland/default.nix

@@ -64,11 +64,9 @@ in
       splash = false;
       preload =
         [ "${./files/wallpaper.png}" ];
-
       wallpaper = [
-        "DP-3,${./files/wallpaper.png}"
+        # Fill in by host-specific config!
-        "DP-2,${./files/wallpaper.png}"
+        # "Display,${./files/wallpaper.png}"
-        "HDMI-A-1,${./files/wallpaper.png}"
       ];
     };
   };

NixOS/home/kell.nix

@@ -0,0 +1,28 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  imports = [
+      (import ./common.nix { inherit inputs config pkgs; })
+      (import ./hyprland { inherit inputs pkgs; })
+      (import ./waybar { inherit inputs pkgs; })
+      ./rofi
+  ];
+
+  services.hyprpaper = {
+    settings = {
+      wallpaper = [
+        "DP-3,${./files/wallpaper.png}"
+        "DP-2,${./files/wallpaper.png}"
+        "HDMI-A-1,${./files/wallpaper.png}"
+      ];
+    };
+  };
+
+  programs.waybar = {
+    settings = {
+      mainBar = {
+        output = "DP-2";
+      };
+    };
+  };
+}

NixOS/home/nixos.nix

@@ -3,5 +3,24 @@
 {
   imports = [
       (import ./common.nix { inherit inputs config pkgs; })
+      (import ./hyprland { inherit inputs pkgs; })
+      (import ./waybar { inherit inputs pkgs; })
+      ./rofi
   ];
+
+  services.hyprpaper = {
+    settings = {
+      wallpaper = [
+        "Virtual-1,${./hyprland/files/wallpaper.png}"
+      ];
+    };
+  };
+
+  programs.waybar = {
+    settings = {
+      mainBar = {
+        output = "Virtual-1";
+      };
+    };
+  };
 }

NixOS/home/waybar/default.nix

@@ -12,7 +12,7 @@
         layer = "top";
         height = 35;
         spacing = 4;
-        output = "DP-2";
+        # output = "DP-2"; # Fill in with host-specific config!
         modules-left = [ "wlr/taskbar" ];
         modules-center = [ "hyprland/workspaces" ];
         modules-right = [ "tray" "wireplumber" "cpu#cpu2" "cpu" "memory" "custom/updates" "temperature" "battery" "clock" "clock#clock2" ];