From b688a738d0ee66fe86ed3a92ca3b856fefd9d47c Mon Sep 17 00:00:00 2001 From: liv Date: Fri, 9 Aug 2024 13:13:23 +0200 Subject: [PATCH] rework home-manager file structure; add simple hyprland conf --- flake.lock | 18 +++++----- flake.nix | 19 ++++++----- home/common/cli/default.nix | 12 +++++++ home/{ => common/cli}/fish.nix | 0 home/common/cli/lazygit.nix | 3 ++ home/common/cli/neovim.nix | 23 +++++++++++++ home/common/universal/default.nix | 12 +++++++ home/{ => common/universal}/mise.nix | 0 home/desktop/hyprland/default.nix | 27 +++++++++++++++ home/devel.nix | 10 ------ home/enoko.nix | 6 ++++ home/global.nix | 39 ++++++++++++++++++++++ home/home.nix | 49 ---------------------------- home/neovim.nix | 23 ------------- home/yukari.nix | 3 ++ 15 files changed, 144 insertions(+), 100 deletions(-) create mode 100644 home/common/cli/default.nix rename home/{ => common/cli}/fish.nix (100%) create mode 100644 home/common/cli/lazygit.nix create mode 100644 home/common/cli/neovim.nix create mode 100644 home/common/universal/default.nix rename home/{ => common/universal}/mise.nix (100%) create mode 100644 home/desktop/hyprland/default.nix delete mode 100644 home/devel.nix create mode 100644 home/enoko.nix create mode 100644 home/global.nix delete mode 100644 home/home.nix delete mode 100644 home/neovim.nix create mode 100644 home/yukari.nix diff --git a/flake.lock b/flake.lock index 786b663..3aba1bd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723015306, + "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, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1722519197, - "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8d81ed1..acf83d1 100644 --- a/flake.nix +++ b/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 ]; }; }; diff --git a/home/common/cli/default.nix b/home/common/cli/default.nix new file mode 100644 index 0000000..6523118 --- /dev/null +++ b/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 `,` + ]; +} diff --git a/home/fish.nix b/home/common/cli/fish.nix similarity index 100% rename from home/fish.nix rename to home/common/cli/fish.nix diff --git a/home/common/cli/lazygit.nix b/home/common/cli/lazygit.nix new file mode 100644 index 0000000..246221d --- /dev/null +++ b/home/common/cli/lazygit.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.lazygit.enable = true; +} diff --git a/home/common/cli/neovim.nix b/home/common/cli/neovim.nix new file mode 100644 index 0000000..c9401bd --- /dev/null +++ b/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; +} diff --git a/home/common/universal/default.nix b/home/common/universal/default.nix new file mode 100644 index 0000000..6331f03 --- /dev/null +++ b/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 + ]; +} diff --git a/home/mise.nix b/home/common/universal/mise.nix similarity index 100% rename from home/mise.nix rename to home/common/universal/mise.nix diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix new file mode 100644 index 0000000..479f0be --- /dev/null +++ b/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}" + ]; + }; + }; +} diff --git a/home/devel.nix b/home/devel.nix deleted file mode 100644 index 6e5fdec..0000000 --- a/home/devel.nix +++ /dev/null @@ -1,10 +0,0 @@ -{lib, pkgs, config, ...}: { - # install some base linux packages for development - home.packages = with pkgs; [ - gcc - gnumake - - lazygit - unzip - ]; -} diff --git a/home/enoko.nix b/home/enoko.nix new file mode 100644 index 0000000..f06bf40 --- /dev/null +++ b/home/enoko.nix @@ -0,0 +1,6 @@ +{ inputs, lib, pkgs, ... }: { + imports = [ + ./global.nix + ./desktop/hyprland + ]; +} diff --git a/home/global.nix b/home/global.nix new file mode 100644 index 0000000..9409bc3 --- /dev/null +++ b/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"; + }; + }; +} diff --git a/home/home.nix b/home/home.nix deleted file mode 100644 index c9e2436..0000000 --- a/home/home.nix +++ /dev/null @@ -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"; -} diff --git a/home/neovim.nix b/home/neovim.nix deleted file mode 100644 index ab39258..0000000 --- a/home/neovim.nix +++ /dev/null @@ -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; -} diff --git a/home/yukari.nix b/home/yukari.nix new file mode 100644 index 0000000..7d432ee --- /dev/null +++ b/home/yukari.nix @@ -0,0 +1,3 @@ +{ inputs, lib, pkgs, ... }: { + # nothing here yet... +}