From 646a484236667f17e03f01d69615b01e43a2a607 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 26 Nov 2024 10:46:47 -0600 Subject: [PATCH] removing a cruft for making nix a little cleaner --- modules/desktop.nix | 84 +-------------------------------------- pkgs/desktop-packages.nix | 16 -------- 2 files changed, 2 insertions(+), 98 deletions(-) diff --git a/modules/desktop.nix b/modules/desktop.nix index 41d7f4e..3c583b6 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -27,13 +27,11 @@ networking.useDHCP = false; boot.supportedFilesystems = [ "ntfs" ]; + services = { desktopManager.cosmic.enable = true; - desktopManager.plasma6 = { - enable = true; - # runUsingSystemd = true; - }; }; + programs.nix-ld.enable = true; programs.ssh.startAgent = true; security.pam.services.kwallet = { @@ -46,31 +44,6 @@ DefaultTimeoutStartSec=10s ''; - # stylix = { - # enable = true; - # polarity = "dark"; - # base16Scheme = { - # base00 = "282a36"; - # base01 = "34353e"; - # base02 = "43454f"; - # base03 = "78787e"; - # base04 = "a5a5a9"; - # base05 = "e2e4e5"; - # base06 = "eff0eb"; - # base07 = "f1f1f0"; - # base08 = "ff5c57"; - # base09 = "ff9f43"; - # base0A = "f3f99d"; - # base0B = "5af78e"; - # base0C = "9aedfe"; - # base0D = "57c7ff"; - # base0E = "ff6ac1"; - # base0F = "b2643c"; - # }; - # image = "base0D"; - # # targets.tofi.enable = false; - # }; - fonts.packages = with pkgs; [ nerdfonts noto-fonts @@ -96,26 +69,6 @@ services.greetd = { enable = true; - # settings = rec { - # initial_session = { - # command = "dbus-run-session Hyprland"; - # # command = "dbus-run-session startplasma-wayland"; - # user = "chris"; - # }; - # default_session = { - # command = - # "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; - # user = "greeter"; - # }; - # plasma_session = { - # command = "dbus-run-session startplasma-wayland"; - # user = "chris"; - # }; - # hyprland_session = { - # command = "Hyprland"; - # user = "chris"; - # }; - # }; }; programs.regreet = { enable = true; }; @@ -132,32 +85,14 @@ enable = true; }; - # environment.etc."xdg/user-dirs.defaults".text = '' - # DESKTOP= - # DOWNLOAD=dls - # TEMPLATES= - # PUBLICSHARE= - # DOCUMENTS=docs - # MUSIC=music - # PICTURES=pics - # VIDEOS=vids - # ''; - xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-kde ]; }; - # programs.cosmic = { - # }; - programs.hyprland = { enable = true; xwayland.enable = true; - # legacyRenderer = true; - # package = stable.hyprland; - # portalPackage = pkgs.xdg-desktop-portal-kde; - # xwayland.hidpi = true; }; services.avahi = { @@ -217,7 +152,6 @@ # Configure keymap in X11 services.xserver.xkb.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; # Enable CUPS to print documents. services.printing.enable = true; @@ -227,20 +161,6 @@ services.usbmuxd.enable = true; services.fstrim.enable = true; - # services.pantalaimon-headless = { - # instances = { - # tfc = { - # homeserver = "https://matrix.tfcconnection.org"; - # # listenAddress = "localhost"; - # listenPort = 8008; - # ssl = true; - # # extraSettings = { - # # IgnoreVerification = true; - # # } - # }; - # }; - # }; - ####################### # VIRTUALIZATION ####################### diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index d57a8f3..b08deb6 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -2,8 +2,6 @@ { environment.systemPackages = with pkgs; [ - discover - lightly-qt pinentry pinentry-qt caffeine-ng @@ -19,7 +17,6 @@ ifuse dash dolphin - vivaldi # guix # freecad # picard @@ -60,7 +57,6 @@ libnotify rofi-wayland wf-recorder - # wofi waybar tridactyl-native # eww @@ -78,25 +74,18 @@ vulkan-tools wayland-utils nextcloud-client - qt5.qtbase - qt5.qtwayland - qt6.qtwayland swww grim slurp plocate papirus-icon-theme phinger-cursors - # plasma-hud kde-cli-tools gzip qrencode - # scribus - darktable virt-manager virt-viewer # kdialog - # kdePackages.khotkeys inkscape # libreoffice-fresh vlc @@ -118,10 +107,7 @@ spotdl # rustdesk kdenlive - # olive-editor # davinci-resolve - # natron - # glaxnimate mediainfo libmediainfo pqiv @@ -136,7 +122,6 @@ # pfetch macchina gimp - krita # powertop power-profiles-daemon scrcpy @@ -144,7 +129,6 @@ nix-index sqlite fennel - blesh kdePackages.plasma-sdk ardour qpwgraph