feat: cleanup
This commit is contained in:
parent
a089e65674
commit
f8f8e58dc9
5 changed files with 65 additions and 34 deletions
|
@ -10,23 +10,5 @@
|
|||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [wezterm.terminfo];
|
||||
|
||||
programs = {
|
||||
bash.interactiveShellInit = ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
|
||||
then
|
||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
direnv.enable = true;
|
||||
fish = {
|
||||
enable = true;
|
||||
useBabelfish = true;
|
||||
};
|
||||
git.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
|
||||
services.vscode-server.enable = true;
|
||||
programs.git.enable = true;
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
enable = true;
|
||||
ports = [1322];
|
||||
settings.PasswordAuthentication = false;
|
||||
settings.PermitRootLogin = "no";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,11 +8,7 @@ in {
|
|||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
users.mutableUsers = false;
|
||||
users.users.root = {
|
||||
hashedPasswordFile = config.age.secrets."system/password-root".path;
|
||||
openssh.authorizedKeys.keys = keys;
|
||||
shell = pkgs.bash;
|
||||
};
|
||||
users.users.root.hashedPasswordFile = config.age.secrets."system/password-root".path;
|
||||
|
||||
users.users.winston = {
|
||||
extraGroups = ["wheel"];
|
||||
|
@ -26,8 +22,21 @@ in {
|
|||
useUserPackages = true;
|
||||
users.winston = {
|
||||
home.stateVersion = "23.11";
|
||||
programs.fish = {
|
||||
|
||||
programs = {
|
||||
bash = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
|
||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
};
|
||||
direnv.enable = true;
|
||||
fish = {
|
||||
enable = true;
|
||||
interactiveShellInit = "set fish_greeting";
|
||||
plugins = [
|
||||
{
|
||||
name = "plugin-git";
|
||||
|
@ -35,6 +44,12 @@ in {
|
|||
}
|
||||
];
|
||||
};
|
||||
nix-index.enable = true;
|
||||
nix-index-database.comma.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
|
||||
services.vscode-server.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
21
flake.lock
21
flake.lock
|
@ -103,6 +103,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709708644,
|
||||
"narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixinate": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -189,6 +209,7 @@
|
|||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixinate": "nixinate",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
|
|
16
flake.nix
16
flake.nix
|
@ -22,6 +22,10 @@
|
|||
config.allowUnfree = true;
|
||||
inherit overlays;
|
||||
};
|
||||
home-manager.sharedModules = [
|
||||
inputs.vscode-server.homeModules.default
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
];
|
||||
}
|
||||
./hosts/main-node
|
||||
./config
|
||||
|
@ -29,7 +33,6 @@
|
|||
inputs.agenix.nixosModules.default
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.valheim-server.nixosModules.default
|
||||
inputs.vscode-server.nixosModules.default
|
||||
];
|
||||
specialArgs = {inherit inputs;};
|
||||
};
|
||||
|
@ -63,7 +66,12 @@
|
|||
|
||||
devShells.default = pkgs.mkShell {
|
||||
inherit (config.pre-commit.devShell) shellHook;
|
||||
buildInputs = with pkgs; [inputs'.agenix.packages.agenix self'.formatter nil];
|
||||
buildInputs = [
|
||||
inputs'.agenix.packages.agenix
|
||||
pkgs.unstable.nh
|
||||
pkgs.unstable.nil
|
||||
self'.formatter
|
||||
];
|
||||
};
|
||||
|
||||
formatter = pkgs.alejandra;
|
||||
|
@ -80,6 +88,10 @@
|
|||
url = "github:nix-community/home-manager/release-23.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-index-database = {
|
||||
url = "github:nix-community/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
|
|
Loading…
Reference in a new issue