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 --- hosts/mercury/config.nix | 24 +++++++++--------------- hosts/mercury/hjem.nix | 14 ++++++++++++++ hosts/mercury/home.nix | 17 ----------------- hosts/mercury/nixos.nix | 31 +++++++++++++++++++++++++++++++ hosts/mercury/system.nix | 30 ------------------------------ 5 files changed, 54 insertions(+), 62 deletions(-) create mode 100644 hosts/mercury/hjem.nix delete mode 100644 hosts/mercury/home.nix create mode 100644 hosts/mercury/nixos.nix delete mode 100644 hosts/mercury/system.nix (limited to 'hosts/mercury') diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index 3790951..4b5ac0d 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -1,15 +1,4 @@ -{inputs, ...}: { - nix-furnace = { - extraSystemModules = [ - inputs.hjem.nixosModules.default - ./system.nix - ./disks.nix - ]; - extraHomeModules = [ - ./home.nix - ]; - }; - +{ collinux = { theme = "catppuccin"; @@ -19,10 +8,15 @@ }; desktop = { - sway.enable = true; wallpaper = ./wallpaper.jpg; - components.fuzzel.enable = true; - components.dunst.enable = true; + + greetd.enable = true; + + sway = { + enable = true; + components.fuzzel.enable = true; + components.dunst.enable = true; + }; programs = { firefox.enable = true; diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix new file mode 100644 index 0000000..b2182e9 --- /dev/null +++ b/hosts/mercury/hjem.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + packages = with pkgs; [ + # GUI apps + tor-browser # don't ask + obsidian + kdePackages.kleopatra + mpv + musescore + qutebrowser + + zotero + zathura + ]; +} diff --git a/hosts/mercury/home.nix b/hosts/mercury/home.nix deleted file mode 100644 index 5e80d16..0000000 --- a/hosts/mercury/home.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - home.preferXdgDirectories = true; - home.packages = with pkgs; [ - # GUI apps - tor-browser # don't ask - obsidian - kdePackages.kleopatra - mpv - musescore - qutebrowser - - zotero - zathura - ]; - - home.stateVersion = "25.05"; -} diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix new file mode 100644 index 0000000..5b1b113 --- /dev/null +++ b/hosts/mercury/nixos.nix @@ -0,0 +1,31 @@ +{ + pkgs, + inputs, + ... +}: { + imports = [ + ./disks.nix + ./battery.nix + ./ai.nix + + inputs.nixos-facter-modules.nixosModules.facter + {facter.reportPath = ./facter.json;} + + inputs.lanzaboote.nixosModules.lanzaboote + ]; + + fonts = { + enableDefaultPackages = false; + packages = with pkgs; [ + ibm-plex + nerd-fonts.iosevka + ]; + }; + + networking.firewall.allowedUDPPorts = [445]; + networking.firewall.allowedTCPPorts = [8000]; + users.users.collin.packages = [pkgs.cifs-utils]; + fonts.fontDir.enable = true; + + system.stateVersion = "25.05"; +} diff --git a/hosts/mercury/system.nix b/hosts/mercury/system.nix deleted file mode 100644 index 0e982a0..0000000 --- a/hosts/mercury/system.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - imports = [ - ./battery.nix - ./ai.nix - - inputs.nixos-facter-modules.nixosModules.facter - {facter.reportPath = ./facter.json;} - - inputs.lanzaboote.nixosModules.lanzaboote - ]; - - fonts = { - enableDefaultPackages = false; - packages = with pkgs; [ - ibm-plex - nerd-fonts.iosevka - ]; - }; - - networking.firewall.allowedUDPPorts = [445]; - networking.firewall.allowedTCPPorts = [8000]; - users.users.collin.packages = [pkgs.cifs-utils]; - fonts.fontDir.enable = true; - - system.stateVersion = "25.05"; -} -- cgit v1.3.1 From 27a46e998c503fe70c4f3011b1b77e5a86d21ce7 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Tue, 9 Sep 2025 20:40:13 -0500 Subject: various "debloating" --- hosts/mercury/config.nix | 2 +- hosts/mercury/nixos.nix | 6 +++++- modules/boot/nixos/default.nix | 2 ++ modules/services/nixos/audio.nix | 2 +- modules/services/nixos/networking/iwd.nix | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) (limited to 'hosts/mercury') diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index 4b5ac0d..a80a871 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -67,7 +67,7 @@ boot = { systemd-boot.enable = true; - plymouth.enable = true; + # plymouth.enable = true; secureBoot.enable = true; }; }; diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 5b1b113..9e59671 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -1,4 +1,5 @@ { + lib, pkgs, inputs, ... @@ -16,16 +17,19 @@ fonts = { enableDefaultPackages = false; + fontDir.enable = true; packages = with pkgs; [ ibm-plex nerd-fonts.iosevka ]; }; + services.speechd.enable = lib.mkForce false; # idk, im not disabled + environment.defaultPackages = lib.mkForce []; # im not a noob + networking.firewall.allowedUDPPorts = [445]; networking.firewall.allowedTCPPorts = [8000]; users.users.collin.packages = [pkgs.cifs-utils]; - fonts.fontDir.enable = true; system.stateVersion = "25.05"; } diff --git a/modules/boot/nixos/default.nix b/modules/boot/nixos/default.nix index 53f18be..66f31fc 100644 --- a/modules/boot/nixos/default.nix +++ b/modules/boot/nixos/default.nix @@ -12,9 +12,11 @@ in { boot = { + bcache.enable = false; # why is this default on? I DON'T CARE ABOUT bcache initrd = { verbose = false; systemd.enable = true; + checkJournalingFS = false; }; loader = { systemd-boot = lib.optionalAttrs (cfg.systemd-boot.enable && !cfg.secureBoot.enable) { diff --git a/modules/services/nixos/audio.nix b/modules/services/nixos/audio.nix index 93f8289..273f1a4 100644 --- a/modules/services/nixos/audio.nix +++ b/modules/services/nixos/audio.nix @@ -7,7 +7,7 @@ cfg = config.collinux.services.audio; in lib.mkIf cfg.enable { - security.rtkit.enable = true; + security.rtkit.enable = false; services.pipewire = { enable = true; wireplumber.enable = true; diff --git a/modules/services/nixos/networking/iwd.nix b/modules/services/nixos/networking/iwd.nix index d081792..441498d 100644 --- a/modules/services/nixos/networking/iwd.nix +++ b/modules/services/nixos/networking/iwd.nix @@ -23,4 +23,5 @@ in useDHCP = false; networkmanager.enable = false; }; + systemd.network.enable = lib.mkForce false; } -- cgit v1.3.1 From 6fabcf9a21bddc9a69f63a32535cfc25fcf668e2 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:51:43 -0500 Subject: work on firefox cfg --- hosts/mercury/nixos.nix | 2 -- modules/desktop/nixos/programs/firefox.nix | 45 +++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) (limited to 'hosts/mercury') diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 9e59671..26fda63 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -23,8 +23,6 @@ nerd-fonts.iosevka ]; }; - - services.speechd.enable = lib.mkForce false; # idk, im not disabled environment.defaultPackages = lib.mkForce []; # im not a noob networking.firewall.allowedUDPPorts = [445]; diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix index 8ca4b30..569a464 100644 --- a/modules/desktop/nixos/programs/firefox.nix +++ b/modules/desktop/nixos/programs/firefox.nix @@ -1,4 +1,5 @@ { + pkgs, lib, config, ... @@ -12,26 +13,50 @@ in PasswordManagerEnabled = false; # use bitwarden instead DisableAccounts = true; DisablePocket = true; + DisplayBookmarksToolbar = "always"; OverrideFirstRunPage = ""; OverridePostUpdatePage = ""; + NewTabPage = false; + + Preferences = let + opt = Value: { + inherit Value; + Status = "locked"; + }; + in { + "toolkit.legacyUserProfileCustomizations.stylesheets" = opt true; + "browser.tabs.inTitlebar" = opt 0; + "browser.tabs.hoverPreview.enabled" = opt 0; + + "browser.tabs.loadBookmarksInTabs" = opt true; + + "accessibility.force_disabled" = opt 1; + + "browser.compactmode.show" = opt true; + "browser.uidensity" = opt 1; + + "media.webspeech.synth.enabled" = opt false; # im not disabled + "media.webspeech.synth.dont_notify_on_error" = opt true; + }; + ExtensionSettings = let ext = name: { installation_mode = "force_installed"; install_url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi"; }; in - lib.mkMerge [ - { - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = ext "bitwarden-password-manager"; - "uBlock0@raymondhill.net" = ext "uBlock0@raymondhill.net"; - "addon@darkreader.org" = ext "addon@darkreader.org"; - } - (lib.optionalAttrs (cfg.theme == "catppuccin") { - "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; - }) - ]; + { + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = ext "bitwarden-password-manager"; + "uBlock0@raymondhill.net" = ext "uBlock0@raymondhill.net"; + "addon@darkreader.org" = ext "addon@darkreader.org"; + } + // (lib.optionalAttrs (cfg.theme == "catppuccin") { + "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue"; + }) }; }; + + services.speechd.enable = lib.mkForce false; # gets installed by firefox, but we don't need it } -- 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 'hosts/mercury') 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 'hosts/mercury') 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 From 97efef82069622c204bbb0bc5c9ffc92399f2c77 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:57:30 -0500 Subject: random mercury fixes --- hosts/mercury/ai.nix | 1 + hosts/mercury/disks.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'hosts/mercury') diff --git a/hosts/mercury/ai.nix b/hosts/mercury/ai.nix index 1bece4a..42a478a 100644 --- a/hosts/mercury/ai.nix +++ b/hosts/mercury/ai.nix @@ -3,4 +3,5 @@ enable = true; loadModels = ["deepseek-r1:1.5b"]; }; + environment.systemPackages = [pkgs.mcphost]; } diff --git a/hosts/mercury/disks.nix b/hosts/mercury/disks.nix index ffa0871..af6c161 100644 --- a/hosts/mercury/disks.nix +++ b/hosts/mercury/disks.nix @@ -1,6 +1,4 @@ { - # TODO: Replace this with disko eventually - fileSystems."/" = { device = "/dev/disk/by-uuid/3d80a86b-3268-4209-a833-b531b8bc0ebc"; fsType = "ext4"; -- cgit v1.3.1