From fa7a407bda1b26b413702287f227629af0798f55 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 8 Mar 2023 02:57:57 -0500 Subject: another major refactor --- users/seth/default.nix | 53 ++++++---------- users/seth/desktop/default.nix | 25 ++------ users/seth/desktop/gnome.nix | 100 ------------------------------ users/seth/desktop/gnome/default.nix | 106 +++++++++++++++++++++++++++++++ users/seth/desktop/plasma.nix | 110 --------------------------------- users/seth/desktop/plasma/default.nix | 113 ++++++++++++++++++++++++++++++++++ users/seth/home.nix | 37 ++++++----- users/seth/shell/bash.nix | 16 ++--- users/seth/shell/default.nix | 1 - users/seth/shell/fish.nix | 21 +++---- 10 files changed, 280 insertions(+), 302 deletions(-) delete mode 100644 users/seth/desktop/gnome.nix create mode 100644 users/seth/desktop/gnome/default.nix delete mode 100644 users/seth/desktop/plasma.nix create mode 100644 users/seth/desktop/plasma/default.nix (limited to 'users/seth') 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.nix deleted file mode 100644 index 8564a5e..0000000 --- a/users/seth/desktop/gnome.nix +++ /dev/null @@ -1,100 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; - [adw-gtk3] - ++ (with pkgs.gnomeExtensions; [ - appindicator - blur-my-shell - caffeine - gradience - ]); - - dconf.settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = [ - "appindicatorsupport@rgcjonas.gmail.com" - "caffeine@patapon.info" - ]; - 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 = ["Tab"]; - switch-windows-backward = ["Tab"]; - }; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { - name = "blackbox"; - command = "blackbox"; - binding = "t"; - }; - "com/raggesilver/BlackBox" = { - font = ''FiraCode Nerd Font 12''; - theme-dark = ''Catppuccin-Mocha''; - remember-window-size = true; - }; - }; - - gtk = { - enable = true; - theme = { - name = "adw-gtk3"; - package = pkgs.adw-gtk3; - }; - }; - - xdg.dataFile."blackbox/schemes/Catppuccin-Mocha.json" = { - text = '' - { - "name": "Catppuccin-Mocha", - "comment": "Soothing pastel theme for the high-spirited!", - "background-color": "#1E1E2E", - "foreground-color": "#CDD6F4", - "badge-color": "#585B70", - "bold-color": "#585B70", - "cursor-background-color": "#F5E0DC", - "cursor-foreground-color": "#1E1E2E", - "highlight-background-color": "#F5E0DC", - "highlight-foreground-color": "#1E1E2E", - "palette": [ - "#45475A", - "#F38BA8", - "#A6E3A1", - "#F9E2AF", - "#89B4FA", - "#F5C2E7", - "#94E2D5", - "#BAC2DE", - "#585B70", - "#F38BA8", - "#A6E3A1", - "#F9E2AF", - "#89B4FA", - "#F5C2E7", - "#94E2D5", - "#A6ADC8" - ], - "use-badge-color": false, - "use-bold-color": false, - "use-cursor-color": true, - "use-highlight-color": true, - "use-theme-colors": false - } - ''; - }; -} diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix new file mode 100644 index 0000000..5dc0030 --- /dev/null +++ b/users/seth/desktop/gnome/default.nix @@ -0,0 +1,106 @@ +{pkgs, ...}: { + imports = [ + ../. + ]; + home.packages = with pkgs; + [adw-gtk3] + ++ (with pkgs.gnomeExtensions; [ + appindicator + blur-my-shell + caffeine + gradience + ]); + + dconf = { + enable = true; + settings = { + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = [ + "appindicatorsupport@rgcjonas.gmail.com" + "caffeine@patapon.info" + ]; + 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 = ["Tab"]; + switch-windows-backward = ["Tab"]; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + name = "blackbox"; + command = "blackbox"; + binding = "t"; + }; + "com/raggesilver/BlackBox" = { + font = ''FiraCode Nerd Font 12''; + theme-dark = ''Catppuccin-Mocha''; + remember-window-size = true; + }; + }; + }; + + gtk = { + enable = true; + theme = { + name = "adw-gtk3"; + package = pkgs.adw-gtk3; + }; + }; + + xdg.dataFile."blackbox/schemes/Catppuccin-Mocha.json" = { + text = '' + { + "name": "Catppuccin-Mocha", + "comment": "Soothing pastel theme for the high-spirited!", + "background-color": "#1E1E2E", + "foreground-color": "#CDD6F4", + "badge-color": "#585B70", + "bold-color": "#585B70", + "cursor-background-color": "#F5E0DC", + "cursor-foreground-color": "#1E1E2E", + "highlight-background-color": "#F5E0DC", + "highlight-foreground-color": "#1E1E2E", + "palette": [ + "#45475A", + "#F38BA8", + "#A6E3A1", + "#F9E2AF", + "#89B4FA", + "#F5C2E7", + "#94E2D5", + "#BAC2DE", + "#585B70", + "#F38BA8", + "#A6E3A1", + "#F9E2AF", + "#89B4FA", + "#F5C2E7", + "#94E2D5", + "#A6ADC8" + ], + "use-badge-color": false, + "use-bold-color": false, + "use-cursor-color": true, + "use-highlight-color": true, + "use-theme-colors": false + } + ''; + }; +} diff --git a/users/seth/desktop/plasma.nix b/users/seth/desktop/plasma.nix deleted file mode 100644 index 29cb574..0000000 --- a/users/seth/desktop/plasma.nix +++ /dev/null @@ -1,110 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - catppuccin-cursors - catppuccin-kde - catppuccin-kvantum - libsForQt5.qtstyleplugin-kvantum - papirus-icon-theme - ]; - - xdg.dataFile."konsole/catppuccin-mocha.colorscheme" = { - text = '' - [Background] - Color=30,30,46 - - [BackgroundFaint] - Color=30,30,46 - - [BackgroundIntense] - Color=30,30,46 - - [Color0] - Color=108,112,134 - - [Color0Faint] - Color=108,112,134 - - [Color0Intense] - Color=108,112,134 - - [Color1] - Color=243,139,168 - - [Color1Faint] - Color=243,139,168 - - [Color1Intense] - Color=243,139,168 - - [Color2] - Color=166,227,161 - - [Color2Faint] - Color=166,227,161 - - [Color2Intense] - Color=166,227,161 - - [Color3] - Color=249,226,175 - - [Color3Faint] - Color=249,226,175 - - [Color3Intense] - Color=249,226,175 - - [Color4] - Color=137,180,250 - - [Color4Faint] - Color=137,180,250 - - [Color4Intense] - Color=137,180,250 - - [Color5] - Color=203,166,247 - - [Color5Faint] - Color=203,166,247 - - [Color5Intense] - Color=203,166,247 - - [Color6] - Color=137,220,235 - - [Color6Faint] - Color=137,220,235 - - [Color6Intense] - Color=137,220,235 - - [Color7] - Color=205,214,244 - - [Color7Faint] - Color=205,214,244 - - [Color7Intense] - Color=205,214,244 - - [Foreground] - Color=205,214,244 - - [ForegroundFaint] - Color=205,214,244 - - [ForegroundIntense] - Color=205,214,244 - - [General] - Blur=false - ColorRandomization=false - Description=Catppuccin Mocha - Opacity=1 - Wallpaper= - ''; - }; -} diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix new file mode 100644 index 0000000..24e26a7 --- /dev/null +++ b/users/seth/desktop/plasma/default.nix @@ -0,0 +1,113 @@ +{pkgs, ...}: { + imports = [ + ../. + ]; + home.packages = with pkgs; [ + catppuccin-cursors + catppuccin-kde + catppuccin-kvantum + libsForQt5.qtstyleplugin-kvantum + papirus-icon-theme + ]; + + xdg.dataFile."konsole/catppuccin-mocha.colorscheme" = { + text = '' + [Background] + Color=30,30,46 + + [BackgroundFaint] + Color=30,30,46 + + [BackgroundIntense] + Color=30,30,46 + + [Color0] + Color=108,112,134 + + [Color0Faint] + Color=108,112,134 + + [Color0Intense] + Color=108,112,134 + + [Color1] + Color=243,139,168 + + [Color1Faint] + Color=243,139,168 + + [Color1Intense] + Color=243,139,168 + + [Color2] + Color=166,227,161 + + [Color2Faint] + Color=166,227,161 + + [Color2Intense] + Color=166,227,161 + + [Color3] + Color=249,226,175 + + [Color3Faint] + Color=249,226,175 + + [Color3Intense] + Color=249,226,175 + + [Color4] + Color=137,180,250 + + [Color4Faint] + Color=137,180,250 + + [Color4Intense] + Color=137,180,250 + + [Color5] + Color=203,166,247 + + [Color5Faint] + Color=203,166,247 + + [Color5Intense] + Color=203,166,247 + + [Color6] + Color=137,220,235 + + [Color6Faint] + Color=137,220,235 + + [Color6Intense] + Color=137,220,235 + + [Color7] + Color=205,214,244 + + [Color7Faint] + Color=205,214,244 + + [Color7Intense] + Color=205,214,244 + + [Foreground] + Color=205,214,244 + + [ForegroundFaint] + Color=205,214,244 + + [ForegroundIntense] + Color=205,214,244 + + [General] + Blur=false + ColorRandomization=false + Description=Catppuccin Mocha + Opacity=1 + Wallpaper= + ''; + }; +} 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"; -- cgit v1.2.3