From f35cd3ac87723539a1c523c5ec6cd43948327b52 Mon Sep 17 00:00:00 2001 From: foglar Date: Sat, 16 Nov 2024 20:32:42 +0100 Subject: [PATCH] cleanup --- TODO.md | 1 + nixos/configuration.nix | 57 ++++++++++++++++++++++++------------- nixos/home.nix | 12 ++++++-- nixos/packages/packages.nix | 3 +- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/TODO.md b/TODO.md index c2988f1..f6c5e9d 100644 --- a/TODO.md +++ b/TODO.md @@ -8,3 +8,4 @@ - [x] Stylix theming - [ ] Enabling nvidia graphics and disabling it - [ ] Modularity connected via configuration.nix file with home manager (disable gnome, gnome configuration will be disabled too) +- [ ] Rofi theme and other themes, where are colors setup declaratively diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d9f22a6..492fe3a 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,6 +1,5 @@ { inputs, - config, pkgs, pkgs-stable, ... @@ -70,24 +69,24 @@ services.printing.enable = true; services.printing.drivers = with pkgs; [gutenprint hplip splix]; hardware.printers = { - ensurePrinters = [ - { - name = "HP_psc_1200_series"; - location = "Home"; - deviceUri = "usb://HP/psc%201200%20series?serial=UA51SGB35WT0&interface=1"; - model = "HP_psc_1200_series.ppd"; - ppdOptions = { - PageSize = "A4"; - }; - } - ]; - ensureDefaultPrinter = "HP_psc_1200_series"; + #ensurePrinters = [ + # { + # name = "HP_psc_1200_series"; + # location = "Home"; + # deviceUri = "usb://HP/psc%201200%20series?serial=UA51SGB35WT0&interface=1"; + # model = "HP_psc_1200_series.ppd"; + # ppdOptions = { + # PageSize = "A4"; + # }; + # } + #]; + #ensureDefaultPrinter = "HP_psc_1200_series"; }; # Scanning hardware.sane.enable = true; - services.ipp-usb.enable= true; - hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ]; + services.ipp-usb.enable = true; + hardware.sane.extraBackends = [pkgs.hplipWithPlugin]; # Set your time zone. time.timeZone = "Europe/Prague"; @@ -114,9 +113,17 @@ monaspace ]; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = true; + services.displayManager = { + defaultSession = "hyprland"; + sddm = { + enable = true; + wayland.enable = true; + theme = "sddm-astronaut-theme"; + package = pkgs.kdePackages.sddm; + extraPackages = [pkgs.sddm-astronaut pkgs.kdePackages.qtvirtualkeyboard]; + }; + }; + #services.desktopManager.plasma6.enable = true; #services.xserver.desktopManager.gnome.enable = true; #environment.gnome.excludePackages = with pkgs; [ # gnome-tour @@ -160,6 +167,7 @@ enable = true; xwayland.enable = true; package = inputs.hyprland.packages."${pkgs.system}".hyprland; + portalPackage = pkgs.xdg-desktop-portal-hyprland; }; virtualisation.libvirtd.enable = true; @@ -225,6 +233,7 @@ }; programs.kdeconnect.enable = true; + programs.wireshark.enable = true; programs.steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play @@ -237,10 +246,18 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = (with pkgs; [ + environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget - ]); + sddm-chili-theme + (sddm-astronaut.override { + themeConfig = { + ScreenWidth = 1920; + ScreenHeight = 1080; + PartialBlur = false; + }; + }) + ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/nixos/home.nix b/nixos/home.nix index c425735..29e886d 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -1,4 +1,5 @@ -{...}: { +{pkgs, +...}: { home.username = "foglar"; home.homeDirectory = "/home/foglar"; home.stateVersion = "24.05"; # Please read the comment before changing. @@ -12,6 +13,13 @@ programming.enable = true; games.enable = true; + gtk.enable = true; + qt = { + enable = true; + style.package = pkgs.libsForQt5.breeze-qt5; + style.name = "breeze-dark"; + platformTheme.name = "kde"; + }; programs.bash = { enable = true; enableCompletion = true; @@ -26,7 +34,7 @@ s = "kitten ssh"; diff = "diff --color"; cd = "z"; - arduino-cli = "arduino-ports-enable ; arduino-cli"; + #arduino-cli = "arduino-ports-enable ; arduino-cli"; respawn = "clear; pfetch"; l = "eza -lh --icons=auto"; mkdir = "mkdir -p"; diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix index fb7832a..a113287 100644 --- a/nixos/packages/packages.nix +++ b/nixos/packages/packages.nix @@ -37,9 +37,8 @@ "steam" "steam-unwrapped" - "enhancer-for-youtube" - "gitkraken" + # VSCODE "vscode" "vscode-extension-github-codespaces"