diff options
Diffstat (limited to 'nix/modules')
| -rw-r--r-- | nix/modules/configuration.nix | 2 | ||||
| -rw-r--r-- | nix/modules/home/default.nix | 4 | ||||
| -rw-r--r-- | nix/modules/home/emacs.nix | 2 | ||||
| -rw-r--r-- | nix/modules/home/hyprland.nix | 36 | ||||
| -rw-r--r-- | nix/modules/home/user.nix | 3 | ||||
| -rw-r--r-- | nix/modules/ollama.nix | 5 |
6 files changed, 22 insertions, 30 deletions
diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 4bbe1bb..a5167a5 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -193,7 +193,6 @@ enableAllFirmware = true; cpu.intel.updateMicrocode = true; graphics.enable = ! config.monorepo.profiles.ttyonly.enable; - pulseaudio.enable = ! config.monorepo.profiles.pipewire.enable; bluetooth = { enable = true; @@ -202,6 +201,7 @@ }; services = { + pulseaudio.enable = ! config.monorepo.profiles.pipewire.enable; chrony = { enable = true; enableNTS = true; diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index 72fcc31..d068383 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -20,7 +20,6 @@ ./mpd.nix ./mako.nix ./user.nix - ./pantalaimon.nix ]; options = { @@ -83,7 +82,6 @@ ]) else []) ++ (if config.monorepo.profiles.workstation.enable then (with pkgs; [ - open-webui mumble ]) else []) ++ @@ -167,7 +165,7 @@ qpwgraph imagemagick inkscape - kdenlive + kdePackages.kdenlive kicad reaper murmur diff --git a/nix/modules/home/emacs.nix b/nix/modules/home/emacs.nix index 71e234c..9ee2424 100644 --- a/nix/modules/home/emacs.nix +++ b/nix/modules/home/emacs.nix @@ -3,7 +3,7 @@ programs.emacs = { enable = lib.mkDefault config.monorepo.profiles.graphics.enable; - package = pkgs.emacs30-pgtk; + package = pkgs.emacs-pgtk; extraConfig = '' (setq debug-on-error t) (org-babel-load-file diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix index 1463f90..fa2a78b 100644 --- a/nix/modules/home/hyprland.nix +++ b/nix/modules/home/hyprland.nix @@ -37,24 +37,24 @@ "Unknown-1,disable" ]; windowrule = [ - "workspace 1, ^(.*emacs.*)$" - "workspace 2, ^(.*firefox.*)$" - "workspace 2, ^(.*Tor Browser.*)$" - "workspace 2, ^(.*Chromium-browser.*)$" - "workspace 2, ^(.*chromium.*)$" - "workspace 3, ^(.*discord.*)$" - "workspace 3, ^(.*vesktop.*)$" - "workspace 3, ^(.*fluffychat.*)$" - "workspace 3, ^(.*element-desktop.*)$" - "workspace 4, ^(.*qpwgraph.*)$" - "workspace 4, ^(.*mpv.*)$" - "workspace 5, ^(.*Monero.*)$" - "workspace 5, ^(.*org\.bitcoin\..*)$" - "workspace 5, ^(.*Bitcoin Core - preston.*)$" - "workspace 5, ^(.*org\.getmonero\..*)$" - "workspace 5, ^(.*Monero - preston.*)$" - "workspace 5, ^(.*electrum.*)$" - "pseudo,fcitx" + "workspace 1, title:(^(.*emacs.*)$)" + "workspace 2, title:(^(.*firefox.*)$)" + "workspace 2, title:(^(.*Tor Browser.*)$)" + "workspace 2, title:(^(.*Chromium-browser.*)$)" + "workspace 2, title:(^(.*chromium.*)$)" + "workspace 3, title:(^(.*discord.*)$)" + "workspace 3, title:^(.*vesktop.*)$)" + "workspace 3, title:(^(.*fluffychat.*)$)" + "workspace 3, title:(^(.*element-desktop.*)$)" + "workspace 4, title:(^(.*qpwgraph.*)$)" + "workspace 4, title:(^(.*mpv.*)$)" + "workspace 5, title:(^(.*Monero.*)$)" + "workspace 5, title:(^(.*org\.bitcoin\..*)$)" + "workspace 5, title:(^(.*Bitcoin Core - preston.*)$)" + "workspace 5, title:(^(.*org\.getmonero\..*)$)" + "workspace 5, title:(^(.*Monero - preston.*)$)" + "workspace 5, title:(^(.*electrum.*)$)" + "pseudo,title:fcitx" ]; bind = [ "$mod, F, exec, firefox" diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix index d0ce5cd..1087ebc 100644 --- a/nix/modules/home/user.nix +++ b/nix/modules/home/user.nix @@ -49,10 +49,9 @@ torsocks tor-browser # fonts - noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 + nerd-fonts.iosevka noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ])) - (nerdfonts.override { fonts = [ "Iosevka" ]; }) # Misc. pinentry diff --git a/nix/modules/ollama.nix b/nix/modules/ollama.nix index 3ac1a52..736d5a4 100644 --- a/nix/modules/ollama.nix +++ b/nix/modules/ollama.nix @@ -6,9 +6,4 @@ host = "0.0.0.0"; openFirewall = true; }; - - services.nextjs-ollama-llm-ui = { - enable = lib.mkDefault config.services.ollama.enable; - port = 3000; - }; } |