diff --git a/flake.lock b/flake.lock index 949b4e2..53c4d60 100644 --- a/flake.lock +++ b/flake.lock @@ -47,74 +47,6 @@ "type": "github" } }, - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -158,22 +90,6 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -250,43 +166,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -309,25 +188,6 @@ "type": "github" } }, - "gnome-shell": { - "flake": false, - "locked": { - "host": "gitlab.gnome.org", - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" - }, - "original": { - "host": "gitlab.gnome.org", - "owner": "GNOME", - "ref": "gnome-49", - "repo": "gnome-shell", - "type": "gitlab" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -584,31 +444,6 @@ "type": "github" } }, - "nur_2": { - "inputs": { - "flake-parts": [ - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", - "owner": "nix-community", - "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "packages": { "flake": false, "locked": { @@ -658,8 +493,7 @@ "noctalia": "noctalia", "nur": "nur", "packages": "packages", - "secrets": "secrets", - "stylix": "stylix" + "secrets": "secrets" } }, "secrets": { @@ -674,40 +508,6 @@ }, "parent": [] }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", - "gnome-shell": "gnome-shell", - "nixpkgs": [ - "nixpkgs" - ], - "nur": "nur_2", - "systems": "systems_3", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-schemes": "tinted-schemes", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" - }, - "locked": { - "lastModified": 1774897726, - "narHash": "sha256-k/H2/oyex6GEC6uYXYetrboFQeTmX1Ouwv/zaW7b/Z0=", - "owner": "nix-community", - "repo": "stylix", - "rev": "9b4a5eb409ceac2dd6ad495c7988e189a418cd30", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -738,102 +538,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, - "tinted-schemes": { - "flake": false, - "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "schemes", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index e5fd43f..c6e1ef0 100644 --- a/flake.nix +++ b/flake.nix @@ -34,11 +34,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; # }; - stylix = { - url = "github:nix-community/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - noctalia = { url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/features/agenix.nix b/modules/features/agenix.nix index 8f9214f..3311393 100644 --- a/modules/features/agenix.nix +++ b/modules/features/agenix.nix @@ -10,8 +10,8 @@ perSystem = { config, pkgs, ... }: { - devShells.nix = pkgs.mkShell { - nativeBuildInputs = [ config.agenix-rekey.package ]; + devShells.default = pkgs.mkShell { + packages = [ config.agenix-rekey.package ]; }; agenix-rekey.nixosConfigurations = inputs.self.nixosConfigurations; diff --git a/modules/features/foot.nix b/modules/features/foot.nix index 5ed9a7e..3329758 100644 --- a/modules/features/foot.nix +++ b/modules/features/foot.nix @@ -10,7 +10,7 @@ term = "xterm-256color"; include = "${config.xdg.configHome}/foot/themes/noctalia"; dpi-aware = "no"; - font = "${config.stylix.fonts.monospace.name}:size=${toString config.stylix.fonts.sizes.terminal}"; + font = "JetBrainsMono Nerd Font:size=12"; }; mouse = { hide-when-typing = "yes"; diff --git a/modules/features/niri.nix b/modules/features/niri.nix index 5c2bf6f..84acc2c 100644 --- a/modules/features/niri.nix +++ b/modules/features/niri.nix @@ -46,6 +46,19 @@ brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl"; in { + home.packages = [ + pkgs.nautilus + ]; + + xdg.portal = { + enable = true; + configPackages = [ pkgs.gnome-session ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gnome + xdg-desktop-portal-gtk + ]; + }; + programs.niri = { # Niri is enabled by niri.nixosModules.niri settings = { @@ -483,8 +496,8 @@ { argv = [ "noctalia-shell" ]; } ]; cursor = { - size = config.stylix.cursor.size; - theme = config.stylix.cursor.name; + size = config.home.pointerCursor.size; + theme = config.home.pointerCursor.name; hide-when-typing = true; }; gestures = { diff --git a/modules/features/styling.nix b/modules/features/styling.nix new file mode 100644 index 0000000..d065514 --- /dev/null +++ b/modules/features/styling.nix @@ -0,0 +1,76 @@ +{ + flake.modules.homeManager.styling = + { + config, + pkgs, + ... + }: + { + home = { + pointerCursor = { + name = "catppuccin-mocha-dark-cursors"; + package = pkgs.catppuccin-cursors.mochaDark; + size = 16; + x11.enable = true; + gtk.enable = true; + }; + packages = with pkgs; [ + nerd-fonts.jetbrains-mono + noto-fonts + noto-fonts-cjk-sans + noto-fonts-color-emoji + ]; + }; + + fonts.fontconfig = { + enable = true; + defaultFonts = { + sansSerif = [ "Noto Sans" ]; + monospace = [ "JetBrainsMono Nerd Font" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + + gtk = { + enable = true; + colorScheme = "dark"; + iconTheme = { + name = "MoreWaita"; + package = pkgs.morewaita-icon-theme; + }; + theme = { + name = "adw-gtk3-dark"; + package = pkgs.adw-gtk3; + }; + gtk4.theme = config.gtk.theme; + }; + + qt = + let + qt_settings = ver: { + Appearance = { + color_scheme_path = "${config.xdg.configHome}/${ver}/colors/noctalia.conf"; + custom_palette = true; + icon_theme = "MoreWaita"; + standard_dialogs = "xdgdesktopportal"; + style = "Breeze"; + }; + Fonts = { + fixed = "\"JetBrainsMono Nerd Font,12\""; + general = "\"Noto Sans,12\""; + }; + }; + in + { + enable = true; + platformTheme.name = "qtct"; + style.name = "breeze"; + qt5ctSettings = qt_settings "qt5ct"; + qt6ctSettings = qt_settings "qt6ct"; + }; + + home.sessionVariables = { + QS_ICON_THEME = "MoreWaita"; + }; + }; +} diff --git a/modules/features/stylix.nix b/modules/features/stylix.nix deleted file mode 100644 index 8776945..0000000 --- a/modules/features/stylix.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - inputs, - ... -}: -{ - flake.modules.homeManager.stylix = - { - config, - pkgs, - ... - }: - { - imports = [ - inputs.stylix.homeModules.stylix - ]; - - # Not really using stylix as it was intended because IMO it sets too many defaults for some - # programs and not enought for others, meaning I wind up setting a lot myself anyway. That - # being said it provides a nice structure for setting fonts, cursors, icons, etc. - stylix = { - enable = true; - autoEnable = false; - polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - cursor = { - name = "catppuccin-mocha-dark-cursors"; - package = pkgs.catppuccin-cursors.mochaDark; - size = 16; - }; - # For some reason setting the fonts' package option doesn't work. - # Just use home.packages instead - fonts = { - monospace.name = "JetBrainsMono Nerd Font"; - sansSerif.name = "Noto Sans"; - emoji.name = "Noto Color Emoji"; - sizes = { - applications = 12; - terminal = 12; - }; - }; - icons = { - enable = true; - package = pkgs.morewaita-icon-theme; - light = "MoreWaita"; - dark = "MoreWaita"; - }; - }; - - # Fonts - home.packages = with pkgs; [ - nerd-fonts.jetbrains-mono - noto-fonts - noto-fonts-cjk-sans - noto-fonts-color-emoji - ]; - - fonts.fontconfig = { - enable = true; - defaultFonts = { - sansSerif = [ "Noto Sans" ]; - monospace = [ "JetBrainsMono Nerd Font" ]; - emoji = [ "Noto Color Emoji" ]; - }; - }; - - gtk = { - enable = true; - colorScheme = config.stylix.polarity; - # iconTheme is set by default by stylix.icons.enable - theme = { - name = "adw-gtk3-${config.stylix.polarity}"; - package = pkgs.adw-gtk3; - }; - gtk4.theme = config.gtk.theme; - }; - - qt = - let - qt_settings = ver: { - Appearance = { - color_scheme_path = "${config.xdg.configHome}/${ver}/colors/noctalia.conf"; - custom_palette = true; - icon_theme = config.stylix.icons.${config.stylix.polarity}; - standard_dialogs = "xdgdesktopportal"; - style = "Breeze"; - }; - Fonts = { - fixed = "\"${config.stylix.fonts.monospace.name},${toString config.stylix.fonts.sizes.applications}\""; - general = "\"${config.stylix.fonts.sansSerif.name},${toString config.stylix.fonts.sizes.applications}\""; - }; - }; - in - { - enable = true; - platformTheme.name = "qtct"; - style.name = "breeze"; - qt5ctSettings = qt_settings "qt5ct"; - qt6ctSettings = qt_settings "qt6ct"; - }; - - home.sessionVariables = { - QS_ICON_THEME = config.stylix.icons.${config.stylix.polarity}; - }; - }; -} diff --git a/modules/features/vicinae.nix b/modules/features/vicinae.nix index db6d5b2..c651ad4 100644 --- a/modules/features/vicinae.nix +++ b/modules/features/vicinae.nix @@ -1,43 +1,38 @@ { - flake.modules.homeManager.vicinae = - { - config, - ... - }: - { - # Not using Vicinae's flake because the server fucking seg faults immediately - programs.vicinae = { + flake.modules.homeManager.vicinae = { + # Not using Vicinae's flake because the server fucking seg faults immediately + programs.vicinae = { + enable = true; + systemd = { enable = true; - systemd = { - enable = true; - autoStart = true; + autoStart = true; + }; + # For configuration option documentation, see: https://github.com/vicinaehq/vicinae/blob/f6222f1e82fe2077ad42f10a6d6837dc61c67fd0/vicinae/assets/config.jsonc + settings = { + escape_key_behavior = "close_window"; + close_on_focus_loss = true; + pop_to_root_on_close = true; + favicon_service = "twenty"; + telemetry = { + system_info = false; }; - # For configuration option documentation, see: https://github.com/vicinaehq/vicinae/blob/f6222f1e82fe2077ad42f10a6d6837dc61c67fd0/vicinae/assets/config.jsonc - settings = { - escape_key_behavior = "close_window"; - close_on_focus_loss = true; - pop_to_root_on_close = true; - favicon_service = "twenty"; - telemetry = { - system_info = false; + font = { + normal = { + size = 12; + family = "JetBrainsMono Nerd Font"; }; - font = { - normal = { - size = config.stylix.fonts.sizes.applications; - family = "${config.stylix.fonts.monospace.name}"; - }; + }; + theme = { + light = { + name = "noctalia"; + icon_theme = "MoreWaita"; }; - theme = { - light = { - name = "noctalia"; - icon_theme = "${config.stylix.icons.light}"; - }; - dark = { - name = "noctalia"; - icon_theme = "${config.stylix.icons.dark}"; - }; + dark = { + name = "noctalia"; + icon_theme = "MoreWaita"; }; }; }; }; + }; } diff --git a/modules/features/xdg.nix b/modules/features/xdg.nix index b809c3a..ba80997 100644 --- a/modules/features/xdg.nix +++ b/modules/features/xdg.nix @@ -2,20 +2,11 @@ flake.modules.homeManager.xdg = { config, - pkgs, ... }: { xdg = { enable = true; - portal = { - enable = true; - configPackages = [ pkgs.gnome-session ]; - extraPortals = with pkgs; [ - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - ]; - }; userDirs = { enable = true; setSessionVariables = true; diff --git a/modules/users/eclypse.nix b/modules/users/eclypse.nix index 55170ad..da5d8f0 100644 --- a/modules/users/eclypse.nix +++ b/modules/users/eclypse.nix @@ -50,7 +50,7 @@ in noctalia ssh starship - stylix + styling swappy vesktop vicinae @@ -77,7 +77,6 @@ in obsidian upscayl trayscale - nautilus # CD Stuff picard diff --git a/packages/pywalfox-native.nix b/packages/pywalfox-native.nix index 64e00f0..cd29c0a 100644 --- a/packages/pywalfox-native.nix +++ b/packages/pywalfox-native.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "pywalfox" ]; meta = { - description = " Native app used alongside the Pywalfox addon"; + description = "Native app used alongside the Pywalfox addon"; homepage = "https://github.com/Frewacom/pywalfox-native"; license = lib.licenses.mpl20; };