rework home-manager file structure; add simple hyprland conf

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722630065,
+        "lastModified": 1723015306,
-        "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
+        "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "afc892db74d65042031a093adb6010c4c3378422",
+        "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722421184,
+        "lastModified": 1722813957,
-        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1722519197,
+        "lastModified": 1722987190,
-        "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
+        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
+        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
         "type": "github"
       },
       "original": {

flake.nix

@@ -24,20 +24,21 @@
         "x86_64-linux"
         "aarch64-darwin"
       ];
-      forEachSystem = f: lib.genAttrs systems (system: import nixpkgs {
+      forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
+      pkgsFor = lib.genAttrs systems (system: import nixpkgs {
         inherit system;
         config.allowUnfree = true;
       });
-      username = "lu";
     in
     {
+      inherit lib;
       packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
       devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
       formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
 
       overlays = import ./overlays { inherit inputs outputs; };
       nixosModules = import ./modules/nixos;
-      homeManagerModules = import ./modules/home;
+      homeManagerModules = import ./modules/home-manager;
 
       nixosConfigurations = {
         enoko = lib.nixosSystem {
@@ -49,19 +50,19 @@
       };
 
       homeConfigurations = {
-        "${username}@yukari" = lib.homeManagerConfiguration {
+        "lu@yukari" = lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          extraSpecialArgs = { inherit inputs outputs username; };
+          extraSpecialArgs = { inherit inputs outputs; };
           modules = [
-            ./home/home.nix
+            ./home/yukari.nix
           ];
         };
 
-        "${username}@enoko" = lib.homeManagerConfiguration {
+        "lu@enoko" = lib.homeManagerConfiguration {
             pkgs = nixpkgs.legacyPackages.x86_64-linux;
-            extraSpecialArgs = { inherit inputs outputs username; };
+            extraSpecialArgs = { inherit inputs outputs; };
             modules = [
-              ./home/home.nix
+              ./home/enoko.nix
             ];
           };
       };

home/common/cli/default.nix

@@ -0,0 +1,12 @@
+# Configures programs that primarily run via the command line
+{ pkgs, ... }: {
+  imports = [
+    ./fish.nix # fish shell configuration
+    ./neovim.nix # neovim configuration, my "escape" editor
+    ./lazygit.nix # my preferred git porcellain
+  ];
+
+  home.packages = with pkgs; [
+    comma # nix-shell a package by prefixing it with `,`
+  ];
+}

home/common/cli/lazygit.nix

@@ -0,0 +1,3 @@
+{ ... }: {
+  programs.lazygit.enable = true;
+}

home/common/cli/neovim.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    extraPackages = with pkgs; [
+      # LazyVim
+      lua-language-server
+      stylua
+      # Telescope
+      ripgrep
+    ];
+
+    plugins = with pkgs.vimPlugins; [
+      lazy-nvim
+    ];
+  };
+
+  xdg.configFile."nvim/init.lua".source = ../../../dotfiles/nvim/init.lua;
+  xdg.configFile."nvim/stylua.toml".source = ../../../dotfiles/nvim/stylua.toml;
+  xdg.configFile."nvim/.neoconf.json".source = ../../../dotfiles/nvim/.neoconf.json;
+  xdg.configFile."nvim/lua".source = ../../../dotfiles/nvim/lua;
+}

home/common/universal/default.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  imports = [
+    ./mise.nix
+  ];
+
+  home.packages = with pkgs; [
+    # some base packages for development, without which nothing would really work
+    gcc
+    gnumake
+    unzip
+  ];
+}

home/desktop/hyprland/default.nix

@@ -0,0 +1,27 @@
+{ lib, config, inputs, pkgs, ... }:
+{
+  wayland.windowManager.hyprland = {
+    enable = true;
+    systemd = {
+      enable = true;
+    };
+
+    settings = {
+      general = {
+        gaps_in = 15;
+        gaps_out = 20;
+        border_size = 2.7;
+        cursor_inactive_timeout = 4;
+      };
+      animations = {
+        enabled = true;
+      };
+
+      bind = let
+        terminal = "${pkgs.kitty}/bin/kitty";
+      in [
+        "SUPER,Return,exec,${terminal}"
+      ];
+    };
+  };
+}

home/devel.nix

@@ -1,10 +0,0 @@
-{lib, pkgs, config, ...}: {
-  # install some base linux packages for development
-  home.packages = with pkgs; [
-    gcc
-    gnumake
-
-    lazygit
-    unzip
-  ];
-}

home/enoko.nix

@@ -0,0 +1,6 @@
+{ inputs, lib, pkgs, ... }: {
+  imports = [
+    ./global.nix
+    ./desktop/hyprland
+  ];
+}

home/global.nix

@@ -0,0 +1,39 @@
+{ inputs, lib, pkgs, config, outputs, ... }: {
+  imports = [
+    ./common/cli
+    ./common/universal
+  ] ++ (builtins.attrValues outputs.homeManagerModules);
+
+  nixpkgs = {
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = (_: true);
+    };
+  };
+
+  nix = {
+    package = lib.mkDefault pkgs.nix;
+    settings = {
+      experimental-features = ["nix-command" "flakes" "repl-flake"];
+      warn-dirty = false;
+    };
+  };
+
+  systemd.user.startServices = "sd-switch";
+  
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+
+  home = {
+    username = lib.mkDefault "lu";
+    homeDirectory = lib.mkDefault "/home/${config.home.username}";
+    stateVersion = lib.mkDefault "24.05";
+    sessionPath = ["$HOME/.local/bin"];
+    sessionVariables = {
+      FLAKE = "$HOME/nix-config";
+    };
+  };
+}

home/home.nix

@@ -1,49 +0,0 @@
-# This is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{ inputs
-, outputs
-, lib
-, config
-, pkgs
-, username
-, ...
-}: {
-  # You can import other home-manager modules here
-  imports = [
-    ./devel.nix
-    ./fish.nix
-    ./neovim.nix
-    ./mise.nix
-  ];
-
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # Add overlays your own flake exports (from overlays and pkgs dir):
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-    ];
-
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-    };
-  };
-
-  home = {
-    inherit username;
-    homeDirectory = "/home/${username}";
-  };
-
-  # Enable home-manager and git
-  programs.home-manager.enable = true;
-  programs.git.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
-}

home/neovim.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.neovim = {
-    enable = true;
-    extraPackages = with pkgs; [
-      # LazyVim
-      lua-language-server
-      stylua
-      # Telescope
-      ripgrep
-    ];
-
-    plugins = with pkgs.vimPlugins; [
-      lazy-nvim
-    ];
-  };
-
-  xdg.configFile."nvim/init.lua".source = ../dotfiles/nvim/init.lua;
-  xdg.configFile."nvim/stylua.toml".source = ../dotfiles/nvim/stylua.toml;
-  xdg.configFile."nvim/.neoconf.json".source = ../dotfiles/nvim/.neoconf.json;
-  xdg.configFile."nvim/lua".source = ../dotfiles/nvim/lua;
-}

home/yukari.nix

@@ -0,0 +1,3 @@
+{ inputs, lib, pkgs, ... }: {
+  # nothing here yet...
+}