diff --git a/flake.lock b/flake.lock index 2cef084..2107834 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1679167473, - "narHash": "sha256-OanhE3TWyIFaX4BZJ9AFh5CEUenhUqxtSbjTDQk8zJE=", + "lastModified": 1679700890, + "narHash": "sha256-u8GqQF/z57LaDf5x/O3IC5qtvwwhLtak+kWosp51F2w=", "owner": "cachix", "repo": "devenv", - "rev": "6f502ad2c3936450763e0957fe0571941d70f6df", + "rev": "c9ff5bd489ca36a526e46440fec4d10a87988363", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1678914447, - "narHash": "sha256-cJRrpVmlDxIl1sEhxoIIo9cCtJ3wGAKWZkFacs3MrRk=", + "lastModified": 1679345933, + "narHash": "sha256-bZVohybatVr/rH5H57QYblsYOLC46Gn2mfHiSk/PNNs=", "owner": "fission-codes", "repo": "nix-overlay", - "rev": "05d1ea73a67535887274750a549b2eaee7af827c", + "rev": "589ff631a13de58b6a06b1d573eb72c135cc14a4", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1679067095, - "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", + "lastModified": 1679758258, + "narHash": "sha256-/fsleSIKfnCCzrn4MIAEDTCKeCe+ZxXEPrKykAI5q08=", "owner": "nix-community", "repo": "home-manager", - "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", + "rev": "d80bf24dab1c1abb3c36e6e28cd30d27599a9620", "type": "github" }, "original": { @@ -970,11 +970,11 @@ }, "nixlib": { "locked": { - "lastModified": 1677373009, - "narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=", + "lastModified": 1679187309, + "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea", + "rev": "44214417fe4595438b31bdb9469be92536a61455", "type": "github" }, "original": { @@ -991,11 +991,11 @@ ] }, "locked": { - "lastModified": 1678351966, - "narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=", + "lastModified": 1679464055, + "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0c043999b16caba6fb571af2d228775729829943", + "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1679075297, - "narHash": "sha256-8TwS7NPQWW9iPejBwWzmjLnK8bQhdOMPpsj3KPAL6x8=", + "lastModified": 1679598117, + "narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "994584bb26ffa1deeaf56099601ef4bcc487273e", + "rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82", "type": "github" }, "original": { @@ -1166,11 +1166,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1679139072, - "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", + "lastModified": 1679163677, + "narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", + "rev": "c3912035d00ef755ab19394488b41feab95d2e40", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1678987615, - "narHash": "sha256-lF4agoB7ysQGNHRXvOqxtSKIZrUZwClA85aASahQlYM=", + "lastModified": 1679734080, + "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194c2aa446b2b059886bb68be15ef6736d5a8c31", + "rev": "dbf5322e93bcc6cfc52268367a8ad21c09d76fea", "type": "github" }, "original": { @@ -1392,11 +1392,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1679152338, - "narHash": "sha256-gOVlCY84Ybbrzi3E8PEK/gOoxANYeU5f8Nm7uNPbjSo=", + "lastModified": 1679377997, + "narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ac6df5bc51439401a0257db4205b3df66b76da0e", + "rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed", "type": "github" }, "original": { diff --git a/hosts/epicurus/darwin-configuration.nix b/hosts/epicurus/darwin-configuration.nix index 45be306..6bba187 100644 --- a/hosts/epicurus/darwin-configuration.nix +++ b/hosts/epicurus/darwin-configuration.nix @@ -19,17 +19,5 @@ # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; - users.users.walkah = { - home = "/Users/walkah"; - shell = pkgs.zsh; - }; - services.lorri.enable = true; - - programs = { - zsh = { - enable = true; - promptInit = ""; - }; - }; } diff --git a/hosts/heraclitus/darwin-configuration.nix b/hosts/heraclitus/darwin-configuration.nix index 390fbcd..38ecb59 100644 --- a/hosts/heraclitus/darwin-configuration.nix +++ b/hosts/heraclitus/darwin-configuration.nix @@ -19,24 +19,12 @@ # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; - users.users.walkah = { - home = "/Users/walkah"; - shell = pkgs.zsh; - }; - services.lorri.enable = true; services.ipfs = { enable = true; package = pkgs.kubo_carmirror; }; - programs = { - zsh = { - enable = true; - promptInit = ""; - }; - }; - system = { defaults = { dock = { diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index 09cd13d..3700914 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -72,11 +72,6 @@ }; }; - programs.mosh.enable = true; - programs.zsh = { - enable = true; - promptInit = ""; - }; programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/hosts/socrates/configuration.nix b/hosts/socrates/configuration.nix index 3f0c4d8..cbb2d5c 100644 --- a/hosts/socrates/configuration.nix +++ b/hosts/socrates/configuration.nix @@ -44,9 +44,6 @@ system.autoUpgrade.enable = false; environment.systemPackages = with pkgs; [ ipfs-migrator ]; - programs.mosh.enable = true; - programs.zsh.enable = true; - security.acme.acceptTerms = true; security.acme.defaults.email = "walkah@walkah.net"; diff --git a/modules/base/common.nix b/modules/base/common.nix index a30d59b..f1fe84e 100644 --- a/modules/base/common.nix +++ b/modules/base/common.nix @@ -22,4 +22,11 @@ _: ]; }; }; + + programs = { + zsh = { + enable = true; + promptInit = ""; + }; + }; } diff --git a/modules/base/darwin.nix b/modules/base/darwin.nix index 614e729..07be0a6 100644 --- a/modules/base/darwin.nix +++ b/modules/base/darwin.nix @@ -1,4 +1,4 @@ -_: { +{ pkgs, ... }: { imports = [ ./common.nix ]; @@ -51,5 +51,10 @@ _: { }; }; + users.users.walkah = { + home = "/Users/walkah"; + shell = pkgs.zsh; + }; + system.stateVersion = 4; } diff --git a/modules/base/default.nix b/modules/base/default.nix index e4025fd..ddc80fe 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -6,6 +6,7 @@ inetutils vim ]; + nix = { gc = { persistent = true; @@ -17,5 +18,9 @@ }; }; + programs = { + mosh.enable = true; + }; + system.stateVersion = "23.05"; }