diff options
| -rw-r--r-- | hosts/mba/default.nix | 14 | ||||
| -rw-r--r-- | hosts/work/default.nix | 4 | ||||
| -rw-r--r-- | nix/flake/hosts.nix | 11 | ||||
| -rw-r--r-- | nix/flake/packages.nix | 3 | ||||
| -rw-r--r-- | nix/profiles/home-manager/personal.nix | 37 | ||||
| -rw-r--r-- | nix/profiles/home-manager/shell.nix | 49 | ||||
| -rw-r--r-- | nix/profiles/home-manager/work.nix | 46 | ||||
| -rw-r--r-- | packages/default.nix | 10 |
8 files changed, 80 insertions, 94 deletions
diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix index 7d20580..772cf8a 100644 --- a/hosts/mba/default.nix +++ b/hosts/mba/default.nix @@ -1,9 +1,17 @@ -{ pkgs, self, ... }: +{ pkgs, ... }: { services.nix-daemon.enable = true; nix = { package = pkgs.nixFlakes; + + gc = { + user = "root"; + automatic = true; + interval = { Weekday = 0; Hour = 2; Minute = 0; }; + options = "--delete-older-than 30d"; + }; + settings = { experimental-features = [ "nix-command" "flakes" ]; }; @@ -19,7 +27,5 @@ # Touch ID for sudo auth security.pam.enableSudoTouchIdAuth = true; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.fcuny = import ../../nix/profiles/home-manager/personal.nix { inherit pkgs self; }; + home-manager.users.fcuny = import ../../nix/profiles/home-manager/personal.nix; } diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 97777e5..bad369a 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -29,7 +29,11 @@ let user = "fcuny"; in # Touch ID for sudo auth security.pam.enableSudoTouchIdAuth = true; +<<<<<<< HEAD home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.fcuny = import ../../nix/profiles/home-manager/work.nix { inherit pkgs self; }; +======= + home-manager.users.fcuny = import ../../nix/profiles/home-manager/work.nix; +>>>>>>> 3a08a78 (share configuration for shell utils) } diff --git a/nix/flake/hosts.nix b/nix/flake/hosts.nix index 8e9316a..c2ba71b 100644 --- a/nix/flake/hosts.nix +++ b/nix/flake/hosts.nix @@ -7,7 +7,16 @@ let darwin.lib.darwinSystem { inherit system; modules = [ - home-manager.darwinModule + home-manager.darwinModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit self; + }; + }; + } ../../hosts/common/darwin/homebrew.nix ../../hosts/common/darwin/macos.nix path diff --git a/nix/flake/packages.nix b/nix/flake/packages.nix index 39bb874..1d310d3 100644 --- a/nix/flake/packages.nix +++ b/nix/flake/packages.nix @@ -11,6 +11,9 @@ packages = { seqstat = pkgs.callPackage "${self}/packages/seqstat" { }; + git-blame-stats = pkgs.callPackage "${self}/packages/git-blame-stats" { }; + git-broom = pkgs.callPackage "${self}/packages/git-broom" { }; + ipconverter = pkgs.callPackage "${self}/packages/ipconverter" { }; }; }; } diff --git a/nix/profiles/home-manager/personal.nix b/nix/profiles/home-manager/personal.nix index 165edcf..dd4c9f9 100644 --- a/nix/profiles/home-manager/personal.nix +++ b/nix/profiles/home-manager/personal.nix @@ -1,4 +1,4 @@ -{ pkgs, self, ... }: { +{ ... }: { home.stateVersion = "23.05"; @@ -6,6 +6,7 @@ ./dev.nix ./firefox.nix ./git.nix + ./shell.nix ./ssh.nix ./zsh.nix ]; @@ -13,38 +14,4 @@ programs.git = { userEmail = "franck@fcuny.net"; }; - - home.packages = with pkgs; [ - direnv - jless - jq - nixd - nix-direnv - nixfmt - nixpkgs-fmt - ripgrep - rnix-lsp - tree - self.packages.${pkgs.system}.seqstat - ]; - - home.sessionVariables = { - EDITOR = "emacsclient -a="; - VISUAL = "emacsclient -a="; - LESS = "-FRSXM"; - LESSCHARSET = "utf-8"; - PAGER = "less"; - }; - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - config = { - global.disable_stdin = true; - global.strict_env = true; - }; - }; - }; } diff --git a/nix/profiles/home-manager/shell.nix b/nix/profiles/home-manager/shell.nix new file mode 100644 index 0000000..3869d9b --- /dev/null +++ b/nix/profiles/home-manager/shell.nix @@ -0,0 +1,49 @@ +{ pkgs, self, ... }: { + + home.packages = with pkgs; [ + # shell utils + direnv + ripgrep + tree + wget + + # data manipulation + jless + jq + yq + + # nix related + nil + nix-direnv + nixd + nixfmt + nixpkgs-fmt + rnix-lsp + + # my own stuff + self.packages.${pkgs.system}.git-blame-stats + self.packages.${pkgs.system}.git-broom + self.packages.${pkgs.system}.ipconverter + self.packages.${pkgs.system}.seqstat + ]; + + home.sessionVariables = { + EDITOR = "emacsclient -a="; + VISUAL = "emacsclient -a="; + LESS = "-FRSXM"; + LESSCHARSET = "utf-8"; + PAGER = "less"; + }; + + programs = { + direnv = { + enable = true; + nix-direnv.enable = true; + enableZshIntegration = true; + config = { + global.disable_stdin = true; + global.strict_env = true; + }; + }; + }; +} diff --git a/nix/profiles/home-manager/work.nix b/nix/profiles/home-manager/work.nix index 4933865..a9800cd 100644 --- a/nix/profiles/home-manager/work.nix +++ b/nix/profiles/home-manager/work.nix @@ -1,4 +1,4 @@ -{ self, pkgs, ... }: { +{ ... }: { home.stateVersion = "23.05"; @@ -6,6 +6,7 @@ ./dev.nix ./firefox.nix ./git.nix + ./shell.nix ./ssh.nix ./zsh.nix ]; @@ -13,47 +14,4 @@ programs.git = { userEmail = "fcuny@roblox.com"; }; - - home.packages = with pkgs; [ - # general shell utils - direnv - ripgrep - tree - wget - - # data manipulation - jless - jq - yq - - # nix related - nil - nix-direnv - nixd - nixfmt - nixpkgs-fmt - rnix-lsp - - self.packages.${pkgs.system}.seqstat - ]; - - home.sessionVariables = { - EDITOR = "emacsclient -a="; - VISUAL = "emacsclient -a="; - LESS = "-FRSXM"; - LESSCHARSET = "utf-8"; - PAGER = "less"; - }; - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - config = { - global.disable_stdin = true; - global.strict_env = true; - }; - }; - }; } diff --git a/packages/default.nix b/packages/default.nix deleted file mode 100644 index 8e537c9..0000000 --- a/packages/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: - -pkgs.lib.makeScope pkgs.newScope (pkgs: { - # dnsmasq-to-html = pkgs.callPackage ./dnsmasq-leases-html { }; - # git-blame-stats = pkgs.callPackage ./git-blame-stats { }; - # git-broom = pkgs.callPackage ./git-broom { }; - # ipconverter = pkgs.callPackage ./ipconverter { }; - # perf-flamegraph-pid = pkgs.callPackage ./perf-flamegraph-pid { }; - seqstat = pkgs.callPackage ./seqstat { }; -}) |