aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

Merge branch 'main' of github.com:8bitbuddhist/nix-configuration

Browse source
This commit is contained in:
Aires 2024-04-13 17:03:56 -04:00
parent 4f172af3be 515d6242c9
commit e0fb6ff716
5 changed files with 81 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -117,11 +117,11 @@
]
},
"locked": {
"lastModified": 1712759992,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
"lastModified": 1713019815,
"narHash": "sha256-jzTo97VeKMNfnKw3xU+uiU5C7wtnLudsbwl/nwPLC7s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
"rev": "8fdf329526f06886b53b94ddf433848a0d142984",
"type": "github"
},
"original": {
@ -174,11 +174,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1712760404,
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
"lastModified": 1712909959,
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
"type": "github"
},
"original": {
@ -222,11 +222,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712608508,
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github"
},
"original": {

1
modules/ui/flatpak.nix
View file

@ -33,6 +33,7 @@ with lib;
packages = [
"com.github.tchx84.Flatseal"
"md.obsidian.Obsidian"
"net.waterfox.waterfox"
"org.keepassxc.KeePassXC"
"org.mozilla.firefox"
];

44
modules/users/aires/default.nix
View file

@ -45,6 +45,7 @@ with lib;
home-manager.users.aires = {
imports = [
../common/gnome.nix
../common/zsh.nix
];
home = {
@ -79,32 +80,21 @@ with lib;
};
};
# Set up Zsh
zsh = {
enable = true;
oh-my-zsh = {
enable = true;
plugins = [
"git"
];
theme = "gentoo";
};
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
prezto = {
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
};
shellAliases = {
dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake .";
update = "upgrade";
upgrade = "cd ~/Development/nix-configuration && nixos-upgrade";
protontricks = "flatpak run com.github.Matoking.protontricks";
please = "sudo";
};
loginExtra = "fastfetch";
};
};
# Set up Zsh
zsh = {
oh-my-zsh = {
theme = "gentoo";
};
shellAliases = {
dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake .";
update = "upgrade";
upgrade = "cd ~/Development/nix-configuration && nixos-upgrade";
protontricks = "flatpak run com.github.Matoking.protontricks";
please = "sudo";
};
loginExtra = "fastfetch";
};
};
# SSH set up in nix-secrets
@ -123,7 +113,7 @@ with lib;
# Autologin aires
(mkIf cfg.autologin {
services.xserver.displayManager.autoLogin = {
services.displayManager.autoLogin = {
enable = true;
user = "aires";
};

30
modules/users/common/zsh.nix Normal file
View file

@ -0,0 +1,30 @@
# Additional ZSH settings via Home Manager
{ pkgs, ... }: {
programs.zsh = {
enable = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
prezto = {
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
};
plugins = [
{
name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub {
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.8.0";
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
};
}
];
oh-my-zsh = {
enable = true;
plugins = [
"git"
];
};
};
}

61
modules/users/gremlin/default.nix
View file

@ -44,6 +44,7 @@ with lib;
home-manager.users.gremlin = {
imports = [
../common/gnome.nix
../common/zsh.nix
];
home = {
@ -65,45 +66,31 @@ with lib;
];
};
programs = {
# Let home Manager install and manage itself.
home-manager.enable = true;
programs = {
# Let home Manager install and manage itself.
home-manager.enable = true;
# Set up git
git = {
# Name and email set in nix-secrets
enable = true;
extraConfig = {
push.autoSetupRemote = "true";
};
};
# Set up git
git = {
# Name and email set in nix-secrets
enable = true;
extraConfig = {
push.autoSetupRemote = "true";
};
};
# Set up Zsh
zsh = {
enable = true;
# Install and source the p10k theme
plugins = [
{ name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; }
{ name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; }
];
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
prezto = {
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
};
shellAliases = {
please = "sudo";
};
oh-my-zsh = {
enable = true;
plugins = [
"git"
];
};
};
};
# Set up Zsh
zsh = {
# Install and source the p10k theme
plugins = [
{ name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; }
{ name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; }
];
shellAliases = {
please = "sudo";
};
};
};
# SSH entries set in nix-secrets
};