From 81693b8ad81a26d6301821c0b7f941981a3098fe Mon Sep 17 00:00:00 2001 From: Cookiez Date: Wed, 27 Aug 2025 13:17:51 +0200 Subject: [PATCH] Set up Hyprland config. Restructured Desktop environment configs into separate folders. --- configuration.nix | 32 ++- flake.nix | 4 +- hardware-configuration.nix | 9 +- home.nix | 41 +--- hyprland.nix | 37 --- hyprland/hyprland-home.nix | 33 +++ hyprland/hyprland.conf | 306 ++++++++++++++++++++++++ hyprland/hyprland.nix | 46 ++++ neovim.nix | 47 ++-- other/aliases | 1 + packages.nix | 43 ++-- autostart.nix => plasma/autostart.nix | 4 +- kde-plasma.nix => plasma/kde-plasma.nix | 33 ++- 13 files changed, 500 insertions(+), 136 deletions(-) delete mode 100644 hyprland.nix create mode 100644 hyprland/hyprland-home.nix create mode 100644 hyprland/hyprland.conf create mode 100644 hyprland/hyprland.nix rename autostart.nix => plasma/autostart.nix (96%) rename kde-plasma.nix => plasma/kde-plasma.nix (71%) diff --git a/configuration.nix b/configuration.nix index a35cc7f..899249d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -31,7 +31,7 @@ #boot.loader.efi.efiSysMountPoint = "/boot/efi"; grub = { enable = true; - device = "/dev/sdb"; #Needs to be changed when using a new computer! (Make grub partition - look below!) + device = "/dev/sda"; #Needs to be changed when using a new computer! (Make grub partition - look below!) #devices = [ "nodev" ]; efiSupport = true; useOSProber = true; @@ -60,6 +60,10 @@ # Enable networking networking.networkmanager.enable = true; + networking.extraHosts = '' + 100.89.141.79 tail-rpi + ''; + # Set your time zone. time.timeZone = "Europe/Berlin"; @@ -101,6 +105,9 @@ meslo-lgs-nf ]; + #In order for dynamically linked executables to work + programs.nix-ld.enable = true; + # Configure console keymap console.keyMap = "de"; @@ -136,6 +143,12 @@ ]; }; + environment.etc."gitconfig".text = '' + [init] + defaultBranch = main + ''; + + #So no user in the group Wheel has to input the password in order to use sudo security.sudo.wheelNeedsPassword = false; @@ -159,6 +172,23 @@ # enable = true; # enableSSHSupport = true; # }; + + services = { + xserver = { + enable = true; + xkb = { + layout = "de"; + variant = ""; + }; + }; + + displayManager.sddm = { + enable = true; + theme = "breeze"; + wayland.enable = true; + }; + }; + # List services that you want to enable: diff --git a/flake.nix b/flake.nix index a9ee314..ff0760e 100644 --- a/flake.nix +++ b/flake.nix @@ -68,9 +68,9 @@ ./configuration.nix ./firefox.nix ./zsh.nix - #./kde-plasma.nix + ./plasma/kde-plasma.nix #./neovim.nix - ./hyprland.nix + ./hyprland/hyprland.nix ./packages.nix grub2-themes.nixosModules.default home-manager.nixosModules.home-manager diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 793dc6b..468e8b9 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "uas" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/22a6fa16-0657-4df8-b3e2-7f95fbae778c"; + { device = "/dev/disk/by-uuid/e50e3c90-8486-46a2-aa7f-ec3ace52344e"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/868C-A59D"; + { device = "/dev/disk/by-uuid/D876-ED20"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/cb5dbfc0-7c90-41f7-9cad-8c75d84c9d18"; } + [ { device = "/dev/disk/by-uuid/a80421d5-1b37-4fd2-b308-fd5bbd81fe10"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -34,6 +34,7 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/home.nix b/home.nix index af77481..50b548c 100644 --- a/home.nix +++ b/home.nix @@ -7,9 +7,10 @@ home.homeDirectory = "/home/${username}"; imports = [ - inputs.zen-browser.homeModules.beta - # or inputs.zen-browser.homeModules.twilight - # or inputs.zen-browser.homeModules.twilight-official + inputs.zen-browser.homeModules.beta + # or inputs.zen-browser.homeModules.twilight + # or inputs.zen-browser.homeModules.twilight-official + ./hyprland/hyprland-home.nix ]; # This value determines the Home Manager release that your @@ -29,8 +30,12 @@ git = { enable = true; - userName = "Cookiez"; - userEmail = "jaden-puerkenauer@web.de"; + userName = "Cookiez"; + userEmail = "jaden-puerkenauer@web.de"; + + extraConfig = { + init.defaultBranch = "main"; + }; }; zen-browser = { @@ -102,29 +107,5 @@ }; }; }; - }; - - - wayland.windowManager.hyprland = { - enable = true; - xwayland.enable = true; - - extraConfig = - '' - input { - kb_layout = de - kb_variant = - kb_model = - kb_rules = - # kb_options = caps:Super_L - follow_mouse = 1 - accel_profile = flat - force_no_accel = true - touchpad { - natural_scroll = no - } - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - } - ''; - }; + }; #End of programs = {}; } diff --git a/hyprland.nix b/hyprland.nix deleted file mode 100644 index 66fc847..0000000 --- a/hyprland.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; - [ - (waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - }) - ) - dunst - libnotify - hyprpaper - - kitty #Terminal - rofi-wayland - ]; - - #programs.hyprland.enable = true; - #programs.hyprland = { - # enable = true; - # xwayland.enable = true; - #}; - - xdg.portal = { - enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - }; - - #sound.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - #alsa.support3Bbit = true; - pulse.enable = true; - jack.enable = true; - }; -} diff --git a/hyprland/hyprland-home.nix b/hyprland/hyprland-home.nix new file mode 100644 index 0000000..91963e3 --- /dev/null +++ b/hyprland/hyprland-home.nix @@ -0,0 +1,33 @@ +{ + wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + + #settings = { + # bind = [ + # "SUPER, Space, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window" + # ]; + #}; + + extraConfig = builtins.readFile ./hyprland.conf; + + #extraConfig = + # '' + # input { + # kb_layout = de + # # kb_variant = + # # kb_model = + # # kb_rules = + # # kb_options = caps:Super_L + # # follow_mouse = 1 + # # accel_profile = flat + # # force_no_accel = true + # # touchpad { + # # natural_scroll = no + # #} + # #sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + # #} + # ''; + }; + +} diff --git a/hyprland/hyprland.conf b/hyprland/hyprland.conf new file mode 100644 index 0000000..1931577 --- /dev/null +++ b/hyprland/hyprland.conf @@ -0,0 +1,306 @@ +# This is an example Hyprland config file. +# Refer to the wiki for more information. +# https://wiki.hyprland.org/Configuring/ + +# Please note not all available settings / options are set here. +# For a full list, see the wiki + +# You can split this configuration into multiple files +# Create your files separately and then link them to this file like this: +# source = ~/.config/hypr/myColors.conf + + +################ +### MONITORS ### +################ + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,preferred,auto,auto + + +################### +### MY PROGRAMS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ + +# Set programs that you use +$terminal = kitty +$fileManager = dolphin +$menu = wofi --show drun + + +################# +### AUTOSTART ### +################# + +# Autostart necessary processes (like notifications daemons, status bars, etc.) +# Or execute your favorite apps at launch like this: + +# exec-once = $terminal +# exec-once = nm-applet & +# exec-once = waybar & hyprpaper & firefox + + +############################# +### ENVIRONMENT VARIABLES ### +############################# + +# See https://wiki.hyprland.org/Configuring/Environment-variables/ + +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 + + +################### +### PERMISSIONS ### +################### + +# See https://wiki.hyprland.org/Configuring/Permissions/ +# Please note permission changes here require a Hyprland restart and are not applied on-the-fly +# for security reasons + +# ecosystem { +# enforce_permissions = 1 +# } + +# permission = /usr/(bin|local/bin)/grim, screencopy, allow +# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow +# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow + + +##################### +### LOOK AND FEEL ### +##################### + +# Refer to https://wiki.hyprland.org/Configuring/Variables/ + +# https://wiki.hyprland.org/Configuring/Variables/#general +general { + gaps_in = 5 + gaps_out = 20 + + border_size = 2 + + # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors + col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + + # Set to true enable resizing windows by clicking and dragging on borders and gaps + resize_on_border = false + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false + + layout = dwindle +} + +# https://wiki.hyprland.org/Configuring/Variables/#decoration +decoration { + rounding = 10 + rounding_power = 2 + + # Change transparency of focused and unfocused windows + active_opacity = 1.0 + inactive_opacity = 1.0 + + shadow { + enabled = true + range = 4 + render_power = 3 + color = rgba(1a1a1aee) + } + + # https://wiki.hyprland.org/Configuring/Variables/#blur + blur { + enabled = true + size = 3 + passes = 1 + + vibrancy = 0.1696 + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#animations +animations { + enabled = yes, please :) + + # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = easeOutQuint,0.23,1,0.32,1 + bezier = easeInOutCubic,0.65,0.05,0.36,1 + bezier = linear,0,0,1,1 + bezier = almostLinear,0.5,0.5,0.75,1.0 + bezier = quick,0.15,0,0.1,1 + + animation = global, 1, 10, default + animation = border, 1, 5.39, easeOutQuint + animation = windows, 1, 4.79, easeOutQuint + animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% + animation = windowsOut, 1, 1.49, linear, popin 87% + animation = fadeIn, 1, 1.73, almostLinear + animation = fadeOut, 1, 1.46, almostLinear + animation = fade, 1, 3.03, quick + animation = layers, 1, 3.81, easeOutQuint + animation = layersIn, 1, 4, easeOutQuint, fade + animation = layersOut, 1, 1.5, linear, fade + animation = fadeLayersIn, 1, 1.79, almostLinear + animation = fadeLayersOut, 1, 1.39, almostLinear + animation = workspaces, 1, 1.94, almostLinear, fade + animation = workspacesIn, 1, 1.21, almostLinear, fade + animation = workspacesOut, 1, 1.94, almostLinear, fade +} + +# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ +# "Smart gaps" / "No gaps when only" +# uncomment all if you wish to use that. +# workspace = w[tv1], gapsout:0, gapsin:0 +# workspace = f[1], gapsout:0, gapsin:0 +# windowrule = bordersize 0, floating:0, onworkspace:w[tv1] +# windowrule = rounding 0, floating:0, onworkspace:w[tv1] +# windowrule = bordersize 0, floating:0, onworkspace:f[1] +# windowrule = rounding 0, floating:0, onworkspace:f[1] + +# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more +dwindle { + pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # You probably want this +} + +# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more +master { + new_status = master +} + +# https://wiki.hyprland.org/Configuring/Variables/#misc +misc { + force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers + disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( +} + + +############# +### INPUT ### +############# + +# https://wiki.hyprland.org/Configuring/Variables/#input +input { + kb_layout = de + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + + touchpad { + natural_scroll = false + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#gestures +gestures { + workspace_swipe = false +} + +# Example per-device config +# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more +device { + name = epic-mouse-v1 + sensitivity = -0.5 +} + + +################### +### KEYBINDINGS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ +$mainMod = SUPER # Sets "Windows" key as main modifier + +#Custom Ones +bind = $mainMod, Space, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, Q, exec, $terminal +bind = $mainMod, C, killactive, +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, $fileManager +bind = $mainMod, V, togglefloating, +bind = $mainMod, R, exec, $menu +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +# Switch workspaces with mainMod + [0-9] +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# Move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +# Example special workspace (scratchpad) +bind = $mainMod, S, togglespecialworkspace, magic +bind = $mainMod SHIFT, S, movetoworkspace, special:magic + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# Laptop multimedia keys for volume and LCD brightness +bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ +bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%- + +# Requires playerctl +bindl = , XF86AudioNext, exec, playerctl next +bindl = , XF86AudioPause, exec, playerctl play-pause +bindl = , XF86AudioPlay, exec, playerctl play-pause +bindl = , XF86AudioPrev, exec, playerctl previous + +############################## +### WINDOWS AND WORKSPACES ### +############################## + +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules + +# Example windowrule +# windowrule = float,class:^(kitty)$,title:^(kitty)$ + +# Ignore maximize requests from apps. You'll probably like this. +windowrule = suppressevent maximize, class:.* + +# Fix some dragging issues with XWayland +windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix new file mode 100644 index 0000000..c77b6a6 --- /dev/null +++ b/hyprland/hyprland.nix @@ -0,0 +1,46 @@ +{ config, pkgs, ... }: +{ + environment.systemPackages = with pkgs; + [ + (waybar.overrideAttrs (oldAttrs: { + mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + }) + ) + dunst + libnotify + hyprpaper + sway #Sway Wayland compositor + + kitty #Terminal + rofi-wayland #Search bar (Meta + Space) + ]; + + programs = { + hyprland = { + enable = true; + xwayland.enable = true; + withUWSM = true; + }; + + waybar.enable = true; + #rofi.enable = true; + }; + + #services.xserver.enable = true; + #services.xserver.displayManager.sddm.enable = true; + + xdg.portal = { + enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + }; + + #sound.enable = true; + #security.rtkit.enable = true; + #services.pipewire = { + # enable = true; + # alsa.enable = true; + # #alsa.support3Bbit = true; + # pulse.enable = true; + # jack.enable = true; + #}; +} diff --git a/neovim.nix b/neovim.nix index 361da8b..84c353f 100644 --- a/neovim.nix +++ b/neovim.nix @@ -1,25 +1,32 @@ { config, lib, pkgs, ... }: { - programs.neovim = { - # ... - plugins = with pkgs.vimPlugins; [ - lazy-nvim - ]; + environment.systemPackages = with pkgs; + [ + neovim + #vimPlugins.LazyVim + ]; + + programs.neovim = { + # ... + plugins = with pkgs.vimPlugins; [ + + LazyVim + ]; - extraLuaConfig = - # lua - '' - require("lazy").setup({ - -- disable all update / install features - -- this is handled by nix - rocks = { enabled = false }, - pkg = { enabled = false }, - install = { missing = false }, - change_detection = { enabled = false }, - spec = { - -- TODO - }, - }) - ''; + #extraLuaConfig = + ## lua + #'' + # require("lazy").setup({ + # -- disable all update / install features + # -- this is handled by nix + # rocks = { enabled = false }, + # pkg = { enabled = false }, + # install = { missing = false }, + # change_detection = { enabled = false }, + # spec = { + # -- TODO + # }, + # }) + #''; }; } diff --git a/other/aliases b/other/aliases index 699493f..c225906 100644 --- a/other/aliases +++ b/other/aliases @@ -43,3 +43,4 @@ alias cd-nix="cd /etc/nixos/" #----- alias exit-hyprland="hyprctl dispatch exit" alias hyprland-exit="hyprctl dispatch exit" +alias hypr-edit="sudoedit /etc/nixos/other/hyprland.conf" diff --git a/packages.nix b/packages.nix index c01ea5c..f7e1f35 100644 --- a/packages.nix +++ b/packages.nix @@ -4,22 +4,19 @@ [ #Essentials (CLI Only) wget #A tool for quickly downloading things from the Web - micro-with-xclip - vimPlugins.LazyVim - neovim - #vimPlugins.vim-wayland-clipboard + micro-with-xclip #Micro text editor with xclip for clipboard thefuck #Error correction in case commands are wrong. Type: 'fuck' jdk23 #Java Development Kit 23 python312 #Python 3.12 python312Packages.pip #Pip for Python 3.12 python312Packages.cmake #The CMake tool to manage project build configurations fastfetch #A utility to see information about your machine - btop #A replacement for htop, see your machines resources + btop #A replacement for htop to see your machines resources git #Git ... no need to explain efibootmgr zip #A utility for ZIP archives - unzip - rar #A utility for RAR Archives + unzip #A utility for ZIP archives + rar #A utility for RAR archives gnutar #A utility for .tar archives cron #A tool to set up commands to run scheduled tmux #A tool to let command windows contiune to run in the background @@ -30,20 +27,20 @@ openssh #SSH zoxide #Alternatice to cd, browse files fzf-zsh #Search for file names - sway coreutils-full multipath-tools #Programming - jetbrains.pycharm-community #The PyCharm IDE to edit Python code - jetbrains.idea-community #The IntelliJ IDE to edit Java code - jetbrains.clion #The CLion IDE to edit and compile c/c++ code - racket #The racket Programming language, with DrRacket IDE, for University (*Not* because it's my favourite) - rustup + #jetbrains.pycharm-community #The PyCharm IDE to edit Python code + #jetbrains.idea-community #The IntelliJ IDE to edit Java code + #jetbrains.clion #The CLion IDE to edit and compile c/c++ code + #racket #The racket Programming language, with DrRacket IDE, for University (*Not* because it's my favourite) + rustup #Rust Programming Toolchain + #go #Go Programming Language #Desktop Applications vlc - steam + #steam #heroic #putty Need to find alternative as it sucks on linux mission-center @@ -52,26 +49,26 @@ spotify rpi-imager kdePackages.yakuake - atlauncher + #atlauncher discord - whatsapp-for-linux - obs-studio - i2p - gparted + #whatsapp-for-linux + #obs-studio + #i2p + gparted #Disk partition Manager #rustdesk mediawriter - #inputs.zen-browser.packages.${pkgs.system}.default realvnc-vnc-viewer + eddie #AirVPN desktop client #CLI tools - eddie #AirVPN client for CLI and Desktop yt-dlp tailscale speedtest-cli - duplicati - ollama + #duplicati + #ollama cloudflare-warp ddrescue + texliveFull #LaTeX PDF maker ]; nixpkgs.config.permittedInsecurePackages = [ diff --git a/autostart.nix b/plasma/autostart.nix similarity index 96% rename from autostart.nix rename to plasma/autostart.nix index aa580b2..7461e69 100644 --- a/autostart.nix +++ b/plasma/autostart.nix @@ -14,7 +14,7 @@ }; systemd.user.services.autostart-yakuake = { - enable = false; + enable = true; description = "Automatically start Yakuake"; #after = [ "plasma-desktop.service" ]; serviceConfig.ExecStart = [ "${pkgs.kdePackages.yakuake}/bin/yakuake" ]; @@ -27,7 +27,7 @@ }; systemd.user.services.autostart-trayscale = { - enable = true; + enable = false; description = "Automatically start Trayscale"; #after = [ "plasma-desktop.service" ]; serviceConfig.ExecStart = [ "${pkgs.trayscale}/bin/trayscale --hide-window" ]; diff --git a/kde-plasma.nix b/plasma/kde-plasma.nix similarity index 71% rename from kde-plasma.nix rename to plasma/kde-plasma.nix index a71e74d..1721432 100644 --- a/kde-plasma.nix +++ b/plasma/kde-plasma.nix @@ -24,13 +24,13 @@ in # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; + #services.xserver.enable = true; # Configure keymap in X11 - services.xserver.xkb = { - layout = "de"; - variant = ""; - }; + #services.xserver.xkb = { + # layout = "de"; + # variant = ""; + #}; #theme-reminder uses a definitive /home/cookiez path!!! system.activationScripts.script.text = '' @@ -40,23 +40,22 @@ in source /etc/nixos/other/theme-reminder.sh ''; - services.displayManager.sddm = { - enable = true; - theme = "breeze"; - wayland.enable = true; - }; + #services.displayManager.sddm = { + # enable = true; + # theme = "breeze"; + # wayland.enable = true; + #}; # Enable the KDE Plasma Desktop Environment. services.desktopManager.plasma6.enable = true; - environment.systemPackages = with pkgs; [ - (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' - [General] - background = "${background-package}" - '') - ]; +# environment.systemPackages = with pkgs; [ +# (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' +# [General] +# background = "${background-package}" +# '') +# ]; programs.steam.enable = true; } -