diff options
Diffstat (limited to 'users/seth')
| -rw-r--r-- | users/seth/default.nix | 53 | ||||
| -rw-r--r-- | users/seth/desktop/default.nix | 25 | ||||
| -rw-r--r-- | users/seth/desktop/gnome/default.nix (renamed from users/seth/desktop/gnome.nix) | 84 | ||||
| -rw-r--r-- | users/seth/desktop/plasma/default.nix (renamed from users/seth/desktop/plasma.nix) | 3 | ||||
| -rw-r--r-- | users/seth/home.nix | 37 | ||||
| -rw-r--r-- | users/seth/shell/bash.nix | 16 | ||||
| -rw-r--r-- | users/seth/shell/default.nix | 1 | ||||
| -rw-r--r-- | users/seth/shell/fish.nix | 21 |
8 files changed, 109 insertions, 131 deletions
diff --git a/users/seth/default.nix b/users/seth/default.nix index c3241d0..52979b3 100644 --- a/users/seth/default.nix +++ b/users/seth/default.nix @@ -1,37 +1,24 @@ { + config, pkgs, - specialArgs, - user, - system ? "x86_64-linux", -}: let - common = { - username = "seth"; - stateVersion = "23.05"; + home-manager, + ... +}: { + users.users.seth = { + extraGroups = ["wheel"]; + isNormalUser = true; + hashedPassword = "***REMOVED***"; + shell = pkgs.fish; }; -in - with user; { - hm.seth = mkHMUser { - inherit (common) username stateVersion; - inherit system; - channel = pkgs; - extraSpecialArgs = { - standalone = true; - desktop = ""; - }; - }; - system = mkUser { - inherit (common) username stateVersion; - inherit system; - extraGroups = ["wheel"]; - extraModules = [ - { - programs.fish.enable = true; - } - ]; - extraSpecialArgs = specialArgs; - hashedPassword = "***REMOVED***"; - shell = pkgs.legacyPackages.${system}.fish; - hm = true; - }; - } + programs.fish.enable = true; + + home-manager.users.seth = let + inherit (config.nixpkgs) overlays; + in { + imports = [ + ./home.nix + ]; + nixpkgs.overlays = overlays; + }; +} diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix index 3e6b68e..3bd83be 100644 --- a/users/seth/desktop/default.nix +++ b/users/seth/desktop/default.nix @@ -1,23 +1,8 @@ -{ - pkgs, - desktop, - ... -}: { - imports = - [ - ../programs/mangohud.nix - ../programs/firefox.nix - ] - ++ ( - if (desktop == "gnome") - then [./gnome.nix] - else [] - ) - ++ ( - if (desktop == "plasma") - then [./plasma.nix] - else [] - ); +{pkgs, ...}: { + imports = [ + ../programs/mangohud.nix + ../programs/firefox.nix + ]; home.packages = with pkgs; [ chromium diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome/default.nix index 8564a5e..5dc0030 100644 --- a/users/seth/desktop/gnome.nix +++ b/users/seth/desktop/gnome/default.nix @@ -1,4 +1,7 @@ {pkgs, ...}: { + imports = [ + ../. + ]; home.packages = with pkgs; [adw-gtk3] ++ (with pkgs.gnomeExtensions; [ @@ -8,45 +11,48 @@ gradience ]); - dconf.settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = [ - ]; - favorite-apps = [ - "firefox.desktop" - "org.gnome.Nautilus.desktop" - "discord-canary.desktop" - ]; - }; - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - font-antialiasing = ''rgba''; - font-name = ''Noto Sans 11''; - document-font-name = ''Noto Sans 11''; - monospace-font-name = ''FiraCode Nerd Font 10''; - }; - "org/gnome/desktop/peripherals/mouse" = { - accel-profile = ''flat''; - }; - "org/gnome/desktop/wm/preferences" = { - titlebar-font = ''Noto Sans Bold 11''; - }; - "org/gnome/desktop/wm/keybindings" = { - switch-windows = ["<Alt>Tab"]; - switch-windows-backward = ["<Shift><Alt>Tab"]; - }; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { - name = "blackbox"; - command = "blackbox"; - binding = "<Control><Alt>t"; - }; - "com/raggesilver/BlackBox" = { - font = ''FiraCode Nerd Font 12''; - theme-dark = ''Catppuccin-Mocha''; - remember-window-size = true; + dconf = { + enable = true; + settings = { + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = [ + ]; + favorite-apps = [ + "firefox.desktop" + "org.gnome.Nautilus.desktop" + "discord-canary.desktop" + ]; + }; + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + font-antialiasing = ''rgba''; + font-name = ''Noto Sans 11''; + document-font-name = ''Noto Sans 11''; + monospace-font-name = ''FiraCode Nerd Font 10''; + }; + "org/gnome/desktop/peripherals/mouse" = { + accel-profile = ''flat''; + }; + "org/gnome/desktop/wm/preferences" = { + titlebar-font = ''Noto Sans Bold 11''; + }; + "org/gnome/desktop/wm/keybindings" = { + switch-windows = ["<Alt>Tab"]; + switch-windows-backward = ["<Shift><Alt>Tab"]; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + name = "blackbox"; + command = "blackbox"; + binding = "<Control><Alt>t"; + }; + "com/raggesilver/BlackBox" = { + font = ''FiraCode Nerd Font 12''; + theme-dark = ''Catppuccin-Mocha''; + remember-window-size = true; + }; }; }; diff --git a/users/seth/desktop/plasma.nix b/users/seth/desktop/plasma/default.nix index 29cb574..24e26a7 100644 --- a/users/seth/desktop/plasma.nix +++ b/users/seth/desktop/plasma/default.nix @@ -1,4 +1,7 @@ {pkgs, ...}: { + imports = [ + ../. + ]; home.packages = with pkgs; [ catppuccin-cursors catppuccin-kde diff --git a/users/seth/home.nix b/users/seth/home.nix index 5c175e7..67b95d1 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -1,16 +1,25 @@ -{desktop, ...}: let - usingDesktop = desktop != ""; -in { - imports = - [ - ./programs - ./shell - ] - ++ ( - if usingDesktop - then [./desktop] - else [] - ); +{ + lib, + pkgs, + ... +}: { + imports = [ + ./programs + ./shell + ]; - nix.settings.warn-dirty = false; + nix = { + package = lib.mkDefault pkgs.nixFlakes; + settings.warn-dirty = false; + }; + xdg = { + enable = true; + configFile."nixpkgs/config.nix".text = '' + { + allowUnfree = true; + allowUnsupportedSystem; + } + ''; + }; + home.stateVersion = "23.05"; } diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix index b3a1257..f9a1afa 100644 --- a/users/seth/shell/bash.nix +++ b/users/seth/shell/bash.nix @@ -1,16 +1,10 @@ -{ - config, - standalone, - ... -}: { +{config, ...}: { programs.bash = { enable = true; - bashrcExtra = - if standalone - then '' - . ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.sh - '' - else ''''; + bashrcExtra = '' + nixfile=${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.sh + [ -e "$nixfile" ] && source "$nixfile" + ''; historyFile = "${config.xdg.stateHome}/bash/history"; historyFileSize = 1000; historySize = 100; diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix index e0e753b..a717e59 100644 --- a/users/seth/shell/default.nix +++ b/users/seth/shell/default.nix @@ -2,7 +2,6 @@ imports = [ ./bash.nix ./fish.nix - ./zsh.nix ]; home = { diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix index c138db5..455a052 100644 --- a/users/seth/shell/fish.nix +++ b/users/seth/shell/fish.nix @@ -1,7 +1,6 @@ { config, pkgs, - standalone, ... }: { xdg.configFile."fish/themes" = { @@ -19,18 +18,14 @@ programs.fish = { enable = true; - interactiveShellInit = - '' - fish_config theme choose "Catppuccin Mocha" - direnv hook fish | source - '' - + ( - if standalone - then '' - . ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish - '' - else '''' - ); + interactiveShellInit = '' + set -l nixfile ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish + if test -e $nixfile + source $nixfile + end + fish_config theme choose "Catppuccin Mocha" + direnv hook fish | source + ''; plugins = [ { name = "autopair-fish"; |