♻️ refactor programs.zsh

This commit is contained in:
James Walker 2023-03-25 15:17:55 -04:00
parent 0e31565644
commit 9c133feed0
Signed by: walkah
GPG Key ID: 3C127179D6086E93
8 changed files with 45 additions and 60 deletions

View File

@ -151,11 +151,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1679167473, "lastModified": 1679700890,
"narHash": "sha256-OanhE3TWyIFaX4BZJ9AFh5CEUenhUqxtSbjTDQk8zJE=", "narHash": "sha256-u8GqQF/z57LaDf5x/O3IC5qtvwwhLtak+kWosp51F2w=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "6f502ad2c3936450763e0957fe0571941d70f6df", "rev": "c9ff5bd489ca36a526e46440fec4d10a87988363",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +264,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1678914447, "lastModified": 1679345933,
"narHash": "sha256-cJRrpVmlDxIl1sEhxoIIo9cCtJ3wGAKWZkFacs3MrRk=", "narHash": "sha256-bZVohybatVr/rH5H57QYblsYOLC46Gn2mfHiSk/PNNs=",
"owner": "fission-codes", "owner": "fission-codes",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "05d1ea73a67535887274750a549b2eaee7af827c", "rev": "589ff631a13de58b6a06b1d573eb72c135cc14a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -661,11 +661,11 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1679067095, "lastModified": 1679758258,
"narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "narHash": "sha256-/fsleSIKfnCCzrn4MIAEDTCKeCe+ZxXEPrKykAI5q08=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "rev": "d80bf24dab1c1abb3c36e6e28cd30d27599a9620",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -970,11 +970,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1677373009, "lastModified": 1679187309,
"narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=", "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea", "rev": "44214417fe4595438b31bdb9469be92536a61455",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -991,11 +991,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1678351966, "lastModified": 1679464055,
"narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=", "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "0c043999b16caba6fb571af2d228775729829943", "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1006,11 +1006,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1679075297, "lastModified": 1679598117,
"narHash": "sha256-8TwS7NPQWW9iPejBwWzmjLnK8bQhdOMPpsj3KPAL6x8=", "narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "994584bb26ffa1deeaf56099601ef4bcc487273e", "rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1166,11 +1166,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1679139072, "lastModified": 1679163677,
"narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", "narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", "rev": "c3912035d00ef755ab19394488b41feab95d2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1293,11 +1293,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1678987615, "lastModified": 1679734080,
"narHash": "sha256-lF4agoB7ysQGNHRXvOqxtSKIZrUZwClA85aASahQlYM=", "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "194c2aa446b2b059886bb68be15ef6736d5a8c31", "rev": "dbf5322e93bcc6cfc52268367a8ad21c09d76fea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1392,11 +1392,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1679152338, "lastModified": 1679377997,
"narHash": "sha256-gOVlCY84Ybbrzi3E8PEK/gOoxANYeU5f8Nm7uNPbjSo=", "narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ac6df5bc51439401a0257db4205b3df66b76da0e", "rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -19,17 +19,5 @@
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
users.users.walkah = {
home = "/Users/walkah";
shell = pkgs.zsh;
};
services.lorri.enable = true; services.lorri.enable = true;
programs = {
zsh = {
enable = true;
promptInit = "";
};
};
} }

View File

@ -19,24 +19,12 @@
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
users.users.walkah = {
home = "/Users/walkah";
shell = pkgs.zsh;
};
services.lorri.enable = true; services.lorri.enable = true;
services.ipfs = { services.ipfs = {
enable = true; enable = true;
package = pkgs.kubo_carmirror; package = pkgs.kubo_carmirror;
}; };
programs = {
zsh = {
enable = true;
promptInit = "";
};
};
system = { system = {
defaults = { defaults = {
dock = { dock = {

View File

@ -72,11 +72,6 @@
}; };
}; };
programs.mosh.enable = true;
programs.zsh = {
enable = true;
promptInit = "";
};
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;

View File

@ -44,9 +44,6 @@
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
environment.systemPackages = with pkgs; [ ipfs-migrator ]; environment.systemPackages = with pkgs; [ ipfs-migrator ];
programs.mosh.enable = true;
programs.zsh.enable = true;
security.acme.acceptTerms = true; security.acme.acceptTerms = true;
security.acme.defaults.email = "walkah@walkah.net"; security.acme.defaults.email = "walkah@walkah.net";

View File

@ -22,4 +22,11 @@ _:
]; ];
}; };
}; };
programs = {
zsh = {
enable = true;
promptInit = "";
};
};
} }

View File

@ -1,4 +1,4 @@
_: { { pkgs, ... }: {
imports = [ ./common.nix ]; imports = [ ./common.nix ];
@ -51,5 +51,10 @@ _: {
}; };
}; };
users.users.walkah = {
home = "/Users/walkah";
shell = pkgs.zsh;
};
system.stateVersion = 4; system.stateVersion = 4;
} }

View File

@ -6,6 +6,7 @@
inetutils inetutils
vim vim
]; ];
nix = { nix = {
gc = { gc = {
persistent = true; persistent = true;
@ -17,5 +18,9 @@
}; };
}; };
programs = {
mosh.enable = true;
};
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }