From dd4641c313e88bad0a82de947abc29c497f22f4d Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 22 Nov 2024 15:32:15 -0500 Subject: seth/desktop: flatten --- users/seth/desktop/budgie.nix | 20 ++++++++++ users/seth/desktop/budgie/default.nix | 20 ---------- users/seth/desktop/default.nix | 8 ++-- users/seth/desktop/gnome.nix | 73 +++++++++++++++++++++++++++++++++++ users/seth/desktop/gnome/default.nix | 73 ----------------------------------- users/seth/desktop/niri.nix | 62 +++++++++++++++++++++++++++++ users/seth/desktop/niri/default.nix | 62 ----------------------------- users/seth/desktop/plasma.nix | 25 ++++++++++++ users/seth/desktop/plasma/default.nix | 25 ------------ 9 files changed, 184 insertions(+), 184 deletions(-) create mode 100644 users/seth/desktop/budgie.nix delete mode 100644 users/seth/desktop/budgie/default.nix create mode 100644 users/seth/desktop/gnome.nix delete mode 100644 users/seth/desktop/gnome/default.nix create mode 100644 users/seth/desktop/niri.nix delete mode 100644 users/seth/desktop/niri/default.nix create mode 100644 users/seth/desktop/plasma.nix delete mode 100644 users/seth/desktop/plasma/default.nix (limited to 'users/seth') diff --git a/users/seth/desktop/budgie.nix b/users/seth/desktop/budgie.nix new file mode 100644 index 0000000..34ecbbd --- /dev/null +++ b/users/seth/desktop/budgie.nix @@ -0,0 +1,20 @@ +{ lib, osConfig, ... }: +let + enable = osConfig.services.xserver.desktopManager.budgie.enable or false; +in +{ + config = lib.mkIf enable { + dconf = { + enable = true; + settings = { + "com.solus-project.budgie-panel:Budgie" = { + pinned-launchers = [ + "firefox.desktop" + "nemo.desktop" + "discord.desktop" + ]; + }; + }; + }; + }; +} diff --git a/users/seth/desktop/budgie/default.nix b/users/seth/desktop/budgie/default.nix deleted file mode 100644 index 34ecbbd..0000000 --- a/users/seth/desktop/budgie/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, osConfig, ... }: -let - enable = osConfig.services.xserver.desktopManager.budgie.enable or false; -in -{ - config = lib.mkIf enable { - dconf = { - enable = true; - settings = { - "com.solus-project.budgie-panel:Budgie" = { - pinned-launchers = [ - "firefox.desktop" - "nemo.desktop" - "discord.desktop" - ]; - }; - }; - }; - }; -} diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix index 8224e03..dcd2f98 100644 --- a/users/seth/desktop/default.nix +++ b/users/seth/desktop/default.nix @@ -17,10 +17,10 @@ in }; imports = [ - ./budgie - ./gnome - ./niri - ./plasma + ./budgie.nix + ./gnome.nix + ./niri.nix + ./plasma.nix ]; config = lib.mkIf cfg.enable { diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome.nix new file mode 100644 index 0000000..6d4158e --- /dev/null +++ b/users/seth/desktop/gnome.nix @@ -0,0 +1,73 @@ +{ + lib, + pkgs, + osConfig, + ... +}: +let + enable = osConfig.services.xserver.desktopManager.gnome.enable or false; +in +{ + config = lib.mkIf enable { + dconf = { + enable = true; + settings = { + "org/gnome/shell" = { + disable-user-extensions = false; + + enabled-extensions = [ "caffeine@patapon.info" ]; + + favorite-apps = [ + "chromium-browser.desktop" + "org.gnome.Nautilus.desktop" + "discord.desktop" + ]; + }; + + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + document-font-name = "Noto Sans 11"; + font-antialiasing = "rgba"; + font-name = "Noto Sans 11"; + monospace-font-name = "NotoMono Nerd Font 10"; + }; + + "org/gnome/desktop/peripherals/mouse" = { + accel-profile = "flat"; + }; + + "org/gnome/desktop/wm/preferences" = { + titlebar-font = "Noto Sans Bold 11"; + }; + + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + name = "ghostty"; + command = "ghostty"; + binding = "t"; + }; + }; + }; + + # Required for adwaita-ize + gtk.enable = true; + + home.packages = [ + # Matrix client + pkgs.fractal + + # Torrent client + pkgs.fragments + + # Keep my screen awake + pkgs.gnomeExtensions.caffeine + + # Mastodon client + pkgs.tuba + ]; + + # See comment for spot + services.spotifyd.enable = true; + + seth.tweaks.adwaita-ize.enable = true; + }; +} diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix deleted file mode 100644 index 6d4158e..0000000 --- a/users/seth/desktop/gnome/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - pkgs, - osConfig, - ... -}: -let - enable = osConfig.services.xserver.desktopManager.gnome.enable or false; -in -{ - config = lib.mkIf enable { - dconf = { - enable = true; - settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - - enabled-extensions = [ "caffeine@patapon.info" ]; - - favorite-apps = [ - "chromium-browser.desktop" - "org.gnome.Nautilus.desktop" - "discord.desktop" - ]; - }; - - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - document-font-name = "Noto Sans 11"; - font-antialiasing = "rgba"; - font-name = "Noto Sans 11"; - monospace-font-name = "NotoMono Nerd Font 10"; - }; - - "org/gnome/desktop/peripherals/mouse" = { - accel-profile = "flat"; - }; - - "org/gnome/desktop/wm/preferences" = { - titlebar-font = "Noto Sans Bold 11"; - }; - - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { - name = "ghostty"; - command = "ghostty"; - binding = "t"; - }; - }; - }; - - # Required for adwaita-ize - gtk.enable = true; - - home.packages = [ - # Matrix client - pkgs.fractal - - # Torrent client - pkgs.fragments - - # Keep my screen awake - pkgs.gnomeExtensions.caffeine - - # Mastodon client - pkgs.tuba - ]; - - # See comment for spot - services.spotifyd.enable = true; - - seth.tweaks.adwaita-ize.enable = true; - }; -} diff --git a/users/seth/desktop/niri.nix b/users/seth/desktop/niri.nix new file mode 100644 index 0000000..9ec7d36 --- /dev/null +++ b/users/seth/desktop/niri.nix @@ -0,0 +1,62 @@ +{ + lib, + pkgs, + osConfig, + ... +}: +let + enable = osConfig.programs.niri.enable or false; +in +{ + config = lib.mkIf enable { + # Set dark theme for Flatpak apps + # https://github.com/YaLTeR/niri/wiki/Important-Software#portals + dconf = { + enable = true; + settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; + }; + }; + + # Required for adwaita-ize + gtk.enable = true; + + home.packages = [ + # Torrent client + pkgs.fragments + + # Mastodon client + pkgs.tuba + + # the funni (I need it for native Wayland support) + pkgs.vesktop + + # TODO: Figure out how to export $DISPLAY from this + # so I don't need the above + pkgs.xwayland-satellite + ]; + + # Enable some things from the NixOS module here to + # apply Catppuccin themes + programs = { + alacritty.enable = true; + fuzzel.enable = true; + mako.enable = true; + ncspot.enable = true; # Official Spotify has ugly CSD + swaylock.enable = true; + yazi.enable = true; + zellij.enable = true; + }; + + seth = { + # See comment about ncspot + services.spotifyd.enable = true; + + tweaks = { + adwaita-ize.enable = true; + }; + }; + }; +} diff --git a/users/seth/desktop/niri/default.nix b/users/seth/desktop/niri/default.nix deleted file mode 100644 index 9ec7d36..0000000 --- a/users/seth/desktop/niri/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - pkgs, - osConfig, - ... -}: -let - enable = osConfig.programs.niri.enable or false; -in -{ - config = lib.mkIf enable { - # Set dark theme for Flatpak apps - # https://github.com/YaLTeR/niri/wiki/Important-Software#portals - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - }; - }; - }; - - # Required for adwaita-ize - gtk.enable = true; - - home.packages = [ - # Torrent client - pkgs.fragments - - # Mastodon client - pkgs.tuba - - # the funni (I need it for native Wayland support) - pkgs.vesktop - - # TODO: Figure out how to export $DISPLAY from this - # so I don't need the above - pkgs.xwayland-satellite - ]; - - # Enable some things from the NixOS module here to - # apply Catppuccin themes - programs = { - alacritty.enable = true; - fuzzel.enable = true; - mako.enable = true; - ncspot.enable = true; # Official Spotify has ugly CSD - swaylock.enable = true; - yazi.enable = true; - zellij.enable = true; - }; - - seth = { - # See comment about ncspot - services.spotifyd.enable = true; - - tweaks = { - adwaita-ize.enable = true; - }; - }; - }; -} diff --git a/users/seth/desktop/plasma.nix b/users/seth/desktop/plasma.nix new file mode 100644 index 0000000..679b1cd --- /dev/null +++ b/users/seth/desktop/plasma.nix @@ -0,0 +1,25 @@ +{ + lib, + pkgs, + osConfig, + ... +}: +let + enable = osConfig.services.desktopManager.plasma6.enable or false; +in +{ + config = lib.mkIf enable { + home.packages = with pkgs; [ papirus-icon-theme ]; + + xdg = { + dataFile."konsole/catppuccin-mocha.colorscheme".source = + pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "konsole"; + rev = "7d86b8a1e56e58f6b5649cdaac543a573ac194ca"; + sha256 = "EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM="; + } + + "/Catppuccin-Mocha.colorscheme"; + }; + }; +} diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix deleted file mode 100644 index 679b1cd..0000000 --- a/users/seth/desktop/plasma/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - pkgs, - osConfig, - ... -}: -let - enable = osConfig.services.desktopManager.plasma6.enable or false; -in -{ - config = lib.mkIf enable { - home.packages = with pkgs; [ papirus-icon-theme ]; - - xdg = { - dataFile."konsole/catppuccin-mocha.colorscheme".source = - pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "konsole"; - rev = "7d86b8a1e56e58f6b5649cdaac543a573ac194ca"; - sha256 = "EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM="; - } - + "/Catppuccin-Mocha.colorscheme"; - }; - }; -} -- cgit v1.2.3