From 7e7c8947fc2ff5598124c4a4c18bd28432fa017e Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Mon, 8 Sep 2025 14:01:35 -0500 Subject: rework most of config; probably broke jupiter again; working to add ganymede (non-nixos) to this repo --- modules/desktop/hjem/default.nix | 12 ++++ modules/desktop/hjem/gtk.nix | 37 ++++++++++ modules/desktop/hjem/programs/firefox.nix | 26 +++++++ modules/desktop/hjem/programs/foot.nix | 61 +++++++++++++++++ modules/desktop/hjem/wm/dunst.nix | 36 ++++++++++ modules/desktop/hjem/wm/fuzzel.nix | 49 +++++++++++++ modules/desktop/hjem/wm/sway.nix | 110 ++++++++++++++++++++++++++++++ 7 files changed, 331 insertions(+) create mode 100644 modules/desktop/hjem/default.nix create mode 100644 modules/desktop/hjem/gtk.nix create mode 100644 modules/desktop/hjem/programs/firefox.nix create mode 100644 modules/desktop/hjem/programs/foot.nix create mode 100644 modules/desktop/hjem/wm/dunst.nix create mode 100644 modules/desktop/hjem/wm/fuzzel.nix create mode 100644 modules/desktop/hjem/wm/sway.nix (limited to 'modules/desktop/hjem') diff --git a/modules/desktop/hjem/default.nix b/modules/desktop/hjem/default.nix new file mode 100644 index 0000000..a1a28c5 --- /dev/null +++ b/modules/desktop/hjem/default.nix @@ -0,0 +1,12 @@ +{ + imports = [ + ./gtk.nix + + ./wm/sway.nix + ./wm/dunst.nix + ./wm/fuzzel.nix + + ./programs/foot.nix + ./programs/firefox.nix + ]; +} diff --git a/modules/desktop/hjem/gtk.nix b/modules/desktop/hjem/gtk.nix new file mode 100644 index 0000000..bee5936 --- /dev/null +++ b/modules/desktop/hjem/gtk.nix @@ -0,0 +1,37 @@ +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.collinux.desktop.gtk; +in { + packages = with pkgs; [ + dconf + + papirus-icon-theme + cfg.cursor_data.package + cfg.theme_data.package + ]; + + xdg.config.files = let + value.Settings = { + gtk-cursor-theme-name = cfg.cursor_data.name; + gtk-cursor-size = 24; + gtk-icon-theme-name = "Papirus"; + gtk-theme-name = cfg.theme_data.name; + }; + in { + "gtk-3.0/settings.ini" = { + generator = lib.generators.toINI {}; + inherit value; + }; + "gtk-4.0/settings.ini" = { + generator = lib.generators.toINI {}; + inherit value; + }; + "gtk-4.0/gtk.css".text = '' + @import url("file://${cfg.theme_data.package}/gtk-4.0/gtk.css"); + ''; + }; +} diff --git a/modules/desktop/hjem/programs/firefox.nix b/modules/desktop/hjem/programs/firefox.nix new file mode 100644 index 0000000..73040d2 --- /dev/null +++ b/modules/desktop/hjem/programs/firefox.nix @@ -0,0 +1,26 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.collinux.desktop.programs.firefox; +in + lib.mkIf cfg.enable { + files.".mozilla/firefox/profiles.ini" = { + generator = lib.generators.toINI {}; + value = { + Profile0 = { + Name = "collin"; + IsRelative = 1; + Path = "collin"; + Default = 1; + }; + General = { + StartWithLastProfile = 1; + Version = 2; + }; + }; + }; + packages = [pkgs.firefox]; + } diff --git a/modules/desktop/hjem/programs/foot.nix b/modules/desktop/hjem/programs/foot.nix new file mode 100644 index 0000000..4d630c6 --- /dev/null +++ b/modules/desktop/hjem/programs/foot.nix @@ -0,0 +1,61 @@ +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.collinux.desktop.programs.foot; + + settings = { + main = { + font = "Iosevka Nerd Font:size=12"; + shell = "${pkgs.fish}/bin/fish"; + }; + + colors = { + foreground = "cdd6f4"; + background = "1e1e2e"; + cursor = "11111b f5e0dc"; + + regular0 = "45475a"; + regular1 = "f38ba8"; + regular2 = "a6e3a1"; + regular3 = "f9e2af"; + regular4 = "89b4fa"; + regular5 = "f5c2e7"; + regular6 = "94e2d5"; + regular7 = "bac2de"; + + bright0 = "585b70"; + bright1 = "f38ba8"; + bright2 = "a6e3a1"; + bright3 = "f9e2af"; + bright4 = "89b4fa"; + bright5 = "f5c2e7"; + bright6 = "94e2d5"; + bright7 = "a6adc8"; + + "16" = "fab387"; + "17" = "f5e0dc"; + + selection-foreground = "cdd6f4"; + selection-background = "414356"; + + search-box-no-match = "11111b f38ba8"; + search-box-match = "cdd6f4 313244"; + + jump-labels = "11111b fab387"; + urls = "89b4fa"; + }; + }; +in + lib.mkIf cfg.enable { + files = { + ".config/foot/foot.ini" = { + generator = lib.generators.toINI {}; + value = settings; + }; + }; + + packages = [pkgs.foot]; + } diff --git a/modules/desktop/hjem/wm/dunst.nix b/modules/desktop/hjem/wm/dunst.nix new file mode 100644 index 0000000..38a8240 --- /dev/null +++ b/modules/desktop/hjem/wm/dunst.nix @@ -0,0 +1,36 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.collinux.desktop.sway.components.dunst; + + settings = '' + [global] + frame_color = "#89b4fa" + separator_color = frame + highlight = "#89b4fa" + offset = "(8,8)" + origin = "top-right" + transparency = 10 + font = "Iosevka Nerd Font" + + [urgency_low] + background = "#1e1e2e" + foreground = "#cdd6f4" + + [urgency_normal] + background = "#1e1e2e" + foreground = "#cdd6f4" + + [urgency_critical] + background = "#1e1e2e" + foreground = "#cdd6f4" + frame_color = "#fab387" + ''; +in + lib.mkIf cfg.enable { + files.".config/dunst/dunstrc".text = settings; + packages = with pkgs; [dunst inotify-tools]; + } diff --git a/modules/desktop/hjem/wm/fuzzel.nix b/modules/desktop/hjem/wm/fuzzel.nix new file mode 100644 index 0000000..7b9d075 --- /dev/null +++ b/modules/desktop/hjem/wm/fuzzel.nix @@ -0,0 +1,49 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.collinux.desktop.sway.components.fuzzel; + + settings = { + main = { + prompt = ""; + dpi-aware = false; + + font = "Iosevka Nerd Font"; + line-height = 25; + lines = 10; + width = 30; + + horizontal-pad = 8; + vertical-pad = 8; + }; + border = { + radius = 0; + width = 2; + }; + + colors = { + background = "1e1e2edd"; + text = "cdd6f4ff"; + prompt = "bac2deff"; + placeholder = "7f849cff"; + input = "cdd6f4ff"; + match = "89b4faff"; + selection = "585b70ff"; + selection-text = "cdd6f4ff"; + selection-match = "89b4faff"; + counter = "7f849cff"; + border = "89b4faff"; + }; + }; +in + lib.mkIf cfg.enable { + files.".config/fuzzel/fuzzel.ini" = { + generator = lib.generators.toINI {}; + value = settings; + }; + + packages = [pkgs.fuzzel]; + } diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix new file mode 100644 index 0000000..1cd7750 --- /dev/null +++ b/modules/desktop/hjem/wm/sway.nix @@ -0,0 +1,110 @@ +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.collinux.desktop.sway; + + colors = '' + set $rosewater #f5e0dc + set $flamingo #f2cdcd + set $pink #f5c2e7 + set $mauve #cba6f7 + set $red #f38ba8 + set $maroon #eba0ac + set $peach #fab387 + set $yellow #f9e2af + set $green #a6e3a1 + set $teal #94e2d5 + set $sky #89dceb + set $sapphire #74c7ec + set $blue #89b4fa + set $lavender #b4befe + set $text #cdd6f4 + set $subtext1 #bac2de + set $subtext0 #a6adc8 + set $overlay2 #9399b2 + set $overlay1 #7f849c + set $overlay0 #6c7086 + set $surface2 #585b70 + set $surface1 #45475a + set $surface0 #313244 + set $base #1e1e2e + set $mantle #181825 + set $crust #11111b + ''; + + settings = '' + exec ${pkgs.foot}/bin/foot --server + exec ${pkgs.swaybg}/bin/swaybg -i ${config.collinux.desktop.wallpaper} + exec ${pkgs.dunst}/bin/dunst + + include catppuccin-mocha + + # target title bg text indicator border + client.focused $lavender $base $text $rosewater $lavender + client.focused_inactive $overlay0 $base $text $rosewater $overlay0 + client.unfocused $overlay0 $base $text $rosewater $overlay0 + client.urgent $peach $base $peach $overlay0 $peach + client.placeholder $overlay0 $base $text $overlay0 $overlay0 + client.background $base + + input type:keyboard { + xkb_options caps:none + } + + bindsym Mod4+1 workspace number 1 + bindsym Mod4+2 workspace number 2 + bindsym Mod4+3 workspace number 3 + bindsym Mod4+4 workspace number 4 + bindsym Mod4+5 workspace number 5 + bindsym Mod4+6 workspace number 6 + bindsym Mod4+7 workspace number 7 + bindsym Mod4+8 workspace number 8 + bindsym Mod4+9 workspace number 9 + + bindsym Mod4+Shift+1 move container to workspace number 1 + bindsym Mod4+Shift+2 move container to workspace number 2 + bindsym Mod4+Shift+3 move container to workspace number 3 + bindsym Mod4+Shift+4 move container to workspace number 4 + bindsym Mod4+Shift+5 move container to workspace number 5 + bindsym Mod4+Shift+6 move container to workspace number 6 + bindsym Mod4+Shift+7 move container to workspace number 7 + bindsym Mod4+Shift+8 move container to workspace number 8 + bindsym Mod4+Shift+9 move container to workspace number 9 + + bindsym Mod4+Return exec ${pkgs.foot}/bin/footclient + bindsym Mod4+Shift+Return exec ${pkgs.foot}/bin/foot + bindsym Mod4+Space exec ${pkgs.fuzzel}/bin/fuzzel + bindsym Mod4+b exec ${pkgs.firefox}/bin/firefox + bindsym Mod4+Shift+b exec ${pkgs.qutebrowser}/bin/qutebrowser + bindsym Mod4+q kill + + bindsym XF86AudioRaiseVolume exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | ${pkgs.bc}/bin/bc)"' + bindsym XF86AudioLowerVolume exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | ${pkgs.bc}/bin/bc)"' + + bindsym XF86MonBrightnessUp exec 'brightnessctl set 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:brightness "Brightness: " -h "int:value:$(g=$(brightnessctl get);m=$(brightnessctl max);echo $((g * 100 / m)))"' + bindsym XF86MonBrightnessDown exec 'brightnessctl set 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:brightness "Brightness: " -h "int:value:$(g=$(brightnessctl get);m=$(brightnessctl max);echo $((g * 100 / m)))"' + + bindsym Home exec 'playerctl previous' + bindsym End exec 'playerctl play-pause' + bindsym Insert exec 'playerctl next' + + default_border pixel 2 + smart_borders on + smart_gaps on + ''; +in + lib.mkIf cfg.enable { + files = { + ".config/sway/config".text = settings; + ".config/sway/catppuccin-mocha".text = colors; + }; + + packages = with pkgs; [ + sway + brightnessctl + playerctl + ]; + } -- cgit v1.3.1 From 64d6e9664bbcbe4125df56f8f228f92222c13188 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:52:55 -0500 Subject: cfg for research applications for mercury --- hosts/mercury/config.nix | 2 ++ hosts/mercury/hjem.nix | 4 ---- modules/desktop/hjem/default.nix | 1 + modules/desktop/hjem/programs/research.nix | 26 ++++++++++++++++++++++++++ modules/desktop/nixos/programs/firefox.nix | 6 ++++++ modules/desktop/options.nix | 6 ++++++ 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 modules/desktop/hjem/programs/research.nix (limited to 'modules/desktop/hjem') diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index a80a871..462c144 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -21,6 +21,8 @@ programs = { firefox.enable = true; foot.enable = true; + + research.enable = true; }; }; diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix index b2182e9..463290c 100644 --- a/hosts/mercury/hjem.nix +++ b/hosts/mercury/hjem.nix @@ -6,9 +6,5 @@ kdePackages.kleopatra mpv musescore - qutebrowser - - zotero - zathura ]; } diff --git a/modules/desktop/hjem/default.nix b/modules/desktop/hjem/default.nix index a1a28c5..f7dd95e 100644 --- a/modules/desktop/hjem/default.nix +++ b/modules/desktop/hjem/default.nix @@ -8,5 +8,6 @@ ./programs/foot.nix ./programs/firefox.nix + ./programs/research.nix ]; } diff --git a/modules/desktop/hjem/programs/research.nix b/modules/desktop/hjem/programs/research.nix new file mode 100644 index 0000000..3bfde76 --- /dev/null +++ b/modules/desktop/hjem/programs/research.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.collinux.desktop.programs.research; +in + lib.mkIf cfg.enable { + packages = with pkgs; [ + zotero + zathura + xournalpp + ]; + files = { + ".config/xournalpp/toolbar.ini" = { + generator = lib.generators.toINI {}; + value = { + "Default" = { + toolbarTop1 = "ERASER,PEN,HIGHLIGHTER,SELECT_PDF_TEXT_LINEAR,SEPARATOR,TEXT,MATH_TEX,IMAGE,SPACER,FINE,MEDIUM,THICK,VERY_THICK,SEPARATOR,SELECT_FONT,COLOR(6),COLOR(8),COLOR(9),COLOR(3),COLOR(2),COLOR(4),COLOR(7),COLOR(5),COLOR(0),SEPARATOR"; + name = "Default"; + }; + }; + }; + }; + } diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix index 569a464..f2daf43 100644 --- a/modules/desktop/nixos/programs/firefox.nix +++ b/modules/desktop/nixos/programs/firefox.nix @@ -55,6 +55,12 @@ in // (lib.optionalAttrs (cfg.theme == "catppuccin") { "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; }) + // (lib.optionalAttrs (cfg.extensions.zotero.enable) { + "zotero@chnm.gmu.edu" = { + installation_mode = "force_installed"; + install_url = "https://download.zotero.org/connector/firefox/release/Zotero_Connector-5.0.181.xpi"; + }; + }); }; }; diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix index 9a60ff6..1837f8b 100644 --- a/modules/desktop/options.nix +++ b/modules/desktop/options.nix @@ -102,10 +102,16 @@ in { type = types.enum ["none" "catppuccin" "adwaita"]; default = config.collinux.theme; }; + extensions.zotero.enable = mkOption { + description = "install Zotero Connector for Firefox"; + default = config.collinux.desktop.programs.research.enable; + }; }; foot.enable = mkEnableOption "foot"; blackbox.enable = mkEnableOption "blackbox"; + + research.enable = mkEnableOption "zathura, Xournal++, Zotero, Zotero Connector"; }; }; }; -- cgit v1.3.1 From d71356eef83e4df59416cd10109cb5688e657c16 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:55:52 -0500 Subject: migrate gtk config to hjem and drop home-manager flake input (yay!) --- flake.lock | 44 +++++++++++++++---------------- flake.nix | 14 ++++------ hosts/mercury/config.nix | 2 ++ hosts/mercury/nixos.nix | 8 ------ modules/desktop/hjem/gtk.nix | 55 ++++++++++++++++++++------------------- modules/desktop/home/default.nix | 5 ---- modules/desktop/home/gtk.nix | 18 ------------- modules/desktop/nixos/default.nix | 1 + modules/desktop/nixos/fonts.nix | 8 ++++++ modules/desktop/nixos/gnome.nix | 6 +++++ modules/desktop/options.nix | 1 + 11 files changed, 73 insertions(+), 89 deletions(-) delete mode 100644 modules/desktop/home/default.nix delete mode 100644 modules/desktop/home/gtk.nix create mode 100644 modules/desktop/nixos/fonts.nix (limited to 'modules/desktop/hjem') diff --git a/flake.lock b/flake.lock index 9180297..ba4e3da 100644 --- a/flake.lock +++ b/flake.lock @@ -115,26 +115,6 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754527677, - "narHash": "sha256-qAzCtmKkMz40xFgP9KN+TCKjVieK4u04EWwl2KvVk0E=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "475d35797d9537354d825260cf583114537affc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -221,10 +201,10 @@ "inputs": { "disko": "disko", "hjem": "hjem", - "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "system-manager": "system-manager" } }, "rust-overlay": { @@ -293,6 +273,26 @@ "type": "github" } }, + "system-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756281415, + "narHash": "sha256-CjpoVwpJJ+DOZilPrDpZ5S3V+B1Y0calaHxTp2xMvGs=", + "owner": "numtide", + "repo": "system-manager", + "rev": "e271eedac9a24678ca6cfc61677837422bf474e0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "system-manager", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 05970ce..747c47a 100644 --- a/flake.nix +++ b/flake.nix @@ -14,11 +14,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # for server that doesn't have nixos system-manager = { url = "github:numtide/system-manager"; @@ -44,12 +39,13 @@ inherit inputs; hostname = "jupiter"; username = "collin"; - module_types = ["hjem" "home" "nixos"]; + module_types = ["hjem" "nixos"]; }; - - systemConfigs."ganymede" = mkSystemManagerSystem { + nixosConfigurations."ganymede" = mkNixosSystem { inherit inputs; - hostanme = "ganymede"; + hostname = "ganymede"; + username = "collin"; + module_types = ["nixos" "hjem"]; }; }; } diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index 462c144..d5f0832 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -10,6 +10,8 @@ desktop = { wallpaper = ./wallpaper.jpg; + gtk.enable = true; + greetd.enable = true; sway = { diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 26fda63..05e84a7 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -15,14 +15,6 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; - fonts = { - enableDefaultPackages = false; - fontDir.enable = true; - packages = with pkgs; [ - ibm-plex - nerd-fonts.iosevka - ]; - }; environment.defaultPackages = lib.mkForce []; # im not a noob networking.firewall.allowedUDPPorts = [445]; diff --git a/modules/desktop/hjem/gtk.nix b/modules/desktop/hjem/gtk.nix index bee5936..3ea3b37 100644 --- a/modules/desktop/hjem/gtk.nix +++ b/modules/desktop/hjem/gtk.nix @@ -5,33 +5,34 @@ ... }: let cfg = config.collinux.desktop.gtk; -in { - packages = with pkgs; [ - dconf +in + lib.mkIf cfg.enable { + packages = with pkgs; [ + dconf - papirus-icon-theme - cfg.cursor_data.package - cfg.theme_data.package - ]; + papirus-icon-theme + cfg.cursor_data.package + cfg.theme_data.package + ]; - xdg.config.files = let - value.Settings = { - gtk-cursor-theme-name = cfg.cursor_data.name; - gtk-cursor-size = 24; - gtk-icon-theme-name = "Papirus"; - gtk-theme-name = cfg.theme_data.name; + xdg.config.files = let + value.Settings = { + gtk-cursor-theme-name = cfg.cursor_data.name; + gtk-cursor-theme-size = 24; + gtk-icon-theme-name = "Papirus"; + gtk-theme-name = cfg.theme_data.name; + }; + in { + "gtk-3.0/settings.ini" = { + generator = lib.generators.toINI {}; + inherit value; + }; + "gtk-4.0/settings.ini" = { + generator = lib.generators.toINI {}; + inherit value; + }; + "gtk-4.0/gtk.css".text = '' + @import url("file://${cfg.theme_data.package}/gtk-4.0/gtk.css"); + ''; }; - in { - "gtk-3.0/settings.ini" = { - generator = lib.generators.toINI {}; - inherit value; - }; - "gtk-4.0/settings.ini" = { - generator = lib.generators.toINI {}; - inherit value; - }; - "gtk-4.0/gtk.css".text = '' - @import url("file://${cfg.theme_data.package}/gtk-4.0/gtk.css"); - ''; - }; -} + } diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix deleted file mode 100644 index 7671378..0000000 --- a/modules/desktop/home/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./gtk.nix - ]; -} diff --git a/modules/desktop/home/gtk.nix b/modules/desktop/home/gtk.nix deleted file mode 100644 index a8f6be0..0000000 --- a/modules/desktop/home/gtk.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - lib, - config, - ... -}: let - cfg = config.collinux.desktop.gtk; -in - lib.mkIf (cfg.enable && cfg.theme == "adwaita") { - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - enable-hot-corners = false; - }; - }; - }; - } diff --git a/modules/desktop/nixos/default.nix b/modules/desktop/nixos/default.nix index 23deeca..1301483 100644 --- a/modules/desktop/nixos/default.nix +++ b/modules/desktop/nixos/default.nix @@ -1,6 +1,7 @@ {...}: { imports = [ ./gnome.nix + ./fonts.nix ./greeters/greetd.nix ./greeters/gdm.nix diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix new file mode 100644 index 0000000..3f10d92 --- /dev/null +++ b/modules/desktop/nixos/fonts.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + fonts = { + enableDefaultPackages = false; + # fontDir.enable = true; + fontconfig.enable = true; + packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot) + }; +} diff --git a/modules/desktop/nixos/gnome.nix b/modules/desktop/nixos/gnome.nix index 967452e..c88a809 100644 --- a/modules/desktop/nixos/gnome.nix +++ b/modules/desktop/nixos/gnome.nix @@ -81,6 +81,12 @@ in sleep-inactive-ac-type = "nothing"; }; + # Theming, etc + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + enable-hot-corners = false; + }; + # Keybindings "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { binding = "Return"; diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix index 1837f8b..72dda95 100644 --- a/modules/desktop/options.nix +++ b/modules/desktop/options.nix @@ -40,6 +40,7 @@ in { gnome.enable = mkEnableOption "gnome"; gtk = { + enable = mkEnableOption "gtk theming"; theme = mkOption { type = types.enum ["catppuccin" "adwaita"]; default = config.collinux.theme; -- cgit v1.3.1