diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | hosts/common/default.nix | 11 | ||||
| -rw-r--r-- | hosts/common/locale.nix | 7 | ||||
| -rw-r--r-- | hosts/common/packages.nix | 16 | ||||
| -rw-r--r-- | users/seth/default.nix | 3 | ||||
| -rw-r--r-- | users/seth/home.nix | 2 | ||||
| -rw-r--r-- | users/seth/programs/neovim.nix | 1 | ||||
| -rw-r--r-- | users/seth/shell/default.nix | 4 | ||||
| -rw-r--r-- | util/host.nix | 6 | ||||
| -rw-r--r-- | util/user.nix | 8 |
10 files changed, 35 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 3ec95d5..cc13626 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -10,10 +10,13 @@ _: { ./users.nix ]; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + settings.warn-dirty = false; }; # config.services.kmscon.enable = true; } diff --git a/hosts/common/locale.nix b/hosts/common/locale.nix index 3e28cfd..e9c7a80 100644 --- a/hosts/common/locale.nix +++ b/hosts/common/locale.nix @@ -1,10 +1,9 @@ _: { i18n = { + supportedLocales = [ + "en_US.UTF-8/UTF-8" + ]; defaultLocale = "en_US.UTF-8"; - extraLocaleSettings = { - LC_MESSAGES = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; }; time = { diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix index 297e9e8..eb60f10 100644 --- a/hosts/common/packages.nix +++ b/hosts/common/packages.nix @@ -4,27 +4,22 @@ }: let gui = desktop != ""; - pinentry = + pinentry = with pkgs; if desktop == "gnome" - then pkgs.pinentry-gnome - else pkgs.pinentry-curses; + then pinentry-gnome + else pinentry-curses; in { environment.systemPackages = with pkgs; [ - git neofetch python311 - vim ] - ++ ( - if gui - then with pkgs; [ firefox ] - else [ ] - ) ++ [ pinentry ]; programs = { + firefox.enable = if gui then true else false; + git.enable = true; gnupg = { agent = { enable = true; @@ -34,5 +29,6 @@ in else "curses"; }; }; + vim.defaultEditor = true; }; } diff --git a/users/seth/default.nix b/users/seth/default.nix index 0675eb4..b278973 100644 --- a/users/seth/default.nix +++ b/users/seth/default.nix @@ -29,8 +29,9 @@ ); home.stateVersion = config.system.stateVersion; + nixpkgs.config.allowUnfree = true; - programs.home-manager.enable = true; + systemd.user.startServices = true; }; }; diff --git a/users/seth/home.nix b/users/seth/home.nix index f5dec19..64bf18e 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -2,4 +2,6 @@ _: { imports = [ ./programs ]; + + nix.settings.warn-dirty = false; } diff --git a/users/seth/programs/neovim.nix b/users/seth/programs/neovim.nix index 741a753..f5c3a59 100644 --- a/users/seth/programs/neovim.nix +++ b/users/seth/programs/neovim.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { programs.neovim = { enable = true; + defaultEditor = true; extraPackages = with pkgs; [ clang codespell diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix index a60470a..263bd22 100644 --- a/users/seth/shell/default.nix +++ b/users/seth/shell/default.nix @@ -2,13 +2,11 @@ imports = [ ./bash.nix ./fish.nix - ./zsh + ./zsh.nix ]; home = { sessionVariables = { - EDITOR = "nvim"; - VISUAL = "nvim"; GPG_TTY = "$(tty)"; CARGO_HOME = "${config.xdg.dataHome}/cargo"; RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; diff --git a/util/host.nix b/util/host.nix index a008566..baedf73 100644 --- a/util/host.nix +++ b/util/host.nix @@ -23,8 +23,10 @@ nixpkgs.config.allowUnfree = true; # Enable nix flakes - nix.package = pkgs.nixFlakes; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix = { + package = pkgs.nixFlakes; + settings.experimental-features = [ "nix-command" "flakes" ]; + }; }) home-manager.nixosModules.home-manager diff --git a/util/user.nix b/util/user.nix index eb12e16..f392eb1 100644 --- a/util/user.nix +++ b/util/user.nix @@ -14,11 +14,19 @@ ../users/${username}/home.nix { nixpkgs.config.allowUnfree = true; + + nix = { + package = channel.legacyPackages.${system}.nixFlakes; + settings.experimental-features = [ "nix-command" "flakes" ]; + }; + systemd.user.startServices = true; + home = { inherit username stateVersion; homeDirectory = "/home/${username}"; }; + programs.home-manager.enable = true; } ] |