reorganise

hyprland/hyprpaper.conf

@@ -1,3 +0,0 @@
-# preload = ~/Pictures/backgrounds/demonslayer.jpg
-# 
-# wallpaper = DP-1,contain: ~/Pictures/backgrounds/demonslayer.jpg

lib/mkconf.nix

@@ -5,13 +5,16 @@ nixpkgs.lib.nixosSystem rec {
 
   modules = [
 
-    ../hardware/${name}.nix
+    ../system/global/system.nix
-    ../system/${name}.nix
+    ../system/${name}/system.nix
-    ../global.nix
+    ../system/${name}/hardware.nix
     home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-      home-manager.users.${user} = import ../home.nix;
+      home-manager.users.${user}.imports = [
+        ../system/global/home.nix
+        ../system/${name}/home.nix
+      ];
     }
   ];
 }

system/global/home.nix

@@ -1,8 +1,6 @@
-{ config, pkgs, user, ... }:
+{ config, pkgs, user, name, ... }:
 # https://nix-community.github.io/home-manager/options.html
 {
-  # don't change
-  home.stateVersion = "22.05";
   programs.home-manager.enable = true;
 
   home.username = "tristan";
@@ -56,16 +54,6 @@
     enable = true;
   };
 
-  programs.git = {
-    enable = true;
-    userName = "tristan";
-    userEmail = "tristan@tristans.cloud";
-    aliases = {
-      graph = "log --oneline --all --graph";
-      amend = "commit --amend --no-edit";
-    };
-  };
-
   programs.swaylock.settings = {
     clock = true;
     screenshots = true;
@@ -208,38 +196,6 @@
   services.nextcloud-client.enable = true;
   services.nextcloud-client.startInBackground = true;
 
-  accounts.email.accounts."tristan@tristans.cloud" = {
-    notmuch.enable = true;
-    neomutt.enable = true;
-    mbsync.enable = true;
-    mbsync.create = "maildir";
-    userName = "tristan@tristans.cloud";
-    realName = "Tristan";
-    address = "tristan@tristans.cloud";
-    primary = true;
-    passwordCommand = "rbw get privateemail";
-    smtp = {
-      host = "mail.privateemail.com";
-      port = 465;
-      tls.enable = true;
-    };
-    imap = {
-      host = "mail.privateemail.com";
-      port = 993;
-      tls.enable = true;
-    };
-  };
-
-  programs.notmuch.enable = true;
-  programs.neomutt = {
-    enable = true;
-    vimKeys = true;
-    sort = "reverse-date";
-    sidebar.enable = true;
-  };
-  programs.mbsync.enable = true;
-  services.mbsync.enable = true;
-
   programs.rbw = {
     enable = true;
     settings = {
@@ -271,10 +227,6 @@
     executable = true;
     recursive = true;
   };
-  home.file.".config/hypr" = {
-    source = ./hyprland;
-    recursive = true;
-  };
   home.file.".config/wofi/config".text = ''
     term=foot
   '';

system/global/system.nix

@@ -17,6 +17,11 @@
 
   time.timeZone = "Europe/London";
   
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true;
+  };
+
   # use pipewire
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;

system/work/config/hypr.conf

@@ -1,8 +1,6 @@
 
 exec-once= ~/.local/scripts/autostart
 monitor=,preferred,auto,1
-monitor=DP-1,1920x1080@144,0x0,1
-monitor=HDMI-A-1,1920x1080@60,1920x0,1
 
 input {
 	kb_file=

system/work/home.nix

@@ -0,0 +1,56 @@
+{ config, pkgs, user, name, ... }:
+# https://nix-community.github.io/home-manager/options.html
+{
+  # don't change
+  home.stateVersion = "22.05";
+
+  home.packages = with pkgs; [
+  ];
+
+  programs.git = {
+    enable = true;
+    userName = "tristan";
+    userEmail = "tristan@tristans.cloud";
+    aliases = {
+      graph = "log --oneline --all --graph";
+      amend = "commit --amend --no-edit";
+    };
+  };
+  
+  accounts.email.accounts."tristan@tristans.cloud" = {
+    notmuch.enable = true;
+    neomutt.enable = true;
+    mbsync.enable = true;
+    mbsync.create = "maildir";
+    userName = "tristan@tristans.cloud";
+    realName = "Tristan";
+    address = "tristan@tristans.cloud";
+    primary = true;
+    passwordCommand = "rbw get privateemail";
+    smtp = {
+      host = "mail.privateemail.com";
+      port = 465;
+      tls.enable = true;
+    };
+    imap = {
+      host = "mail.privateemail.com";
+      port = 993;
+      tls.enable = true;
+    };
+  };
+
+  programs.notmuch.enable = true;
+  programs.neomutt = {
+    enable = true;
+    vimKeys = true;
+    sort = "reverse-date";
+    sidebar.enable = true;
+  };
+  programs.mbsync.enable = true;
+  services.mbsync.enable = true;
+
+  home.file.".config/hypr/hyprland.conf" = {
+    source = ./config/hypr.conf;
+  };
+
+}

system/work/system.nix

@@ -5,10 +5,6 @@
 
   networking.hostName = "FCS-Tristan-Nixbook";
 
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true;
-  };
   services.xserver = {
     layout = "gb";
     xkbVariant = "dvorak";

system/zenix/system.nix

@@ -5,8 +5,9 @@
 
   networking.hostName = "zenix";
 
-  console = {
+  services.xserver = {
-    font = "Lat2-Terminus16";
+    layout = "gb";
+    xkbOptions = "caps:escape";
   };
 
   services.openssh.enable = true;