From 08c71dfb6ef728c88006252e1b93cc8ac910bb0e Mon Sep 17 00:00:00 2001 From: glennigen Date: Tue, 14 Jul 2026 21:16:03 +0200 Subject: [PATCH] modified: home.nix modified: hosts/nixos-x260/default.nix modified: modules/apps/native.nix modified: modules/desktop/kde.nix --- home.nix | 8 +++-- hosts/nixos-x260/default.nix | 53 +++++++++++++++++-------------- modules/apps/native.nix | 16 ++++++++-- modules/desktop/kde.nix | 61 +++++++++++++++++++++++++----------- 4 files changed, 90 insertions(+), 48 deletions(-) diff --git a/home.nix b/home.nix index 0f5d7e6..80540ef 100644 --- a/home.nix +++ b/home.nix @@ -1,17 +1,20 @@ { config, pkgs, ... }: { home.username = "glennigen"; home.homeDirectory = "/home/glennigen"; + home.keyboard.layout = "dk"; + home.keyboard.variant = "winkeys"; home.stateVersion = "26.05"; # Bruger-specifikke pakker — kun til glennigen home.packages = with pkgs; [ # Editorer (personlige valg) vscodium + powershell # sublime4 #insecure OpenSSL? # Media - sone # musikafspiller - obs-studio # streaming/optagelse + sone # musikafspiller + obs-studio # streaming/optagelse # Discord (Equibop) equibop @@ -21,6 +24,7 @@ # Browser firefox + teams-for-linux ]; programs.bash.enable = true; diff --git a/hosts/nixos-x260/default.nix b/hosts/nixos-x260/default.nix index f75e182..ac6b7bb 100644 --- a/hosts/nixos-x260/default.nix +++ b/hosts/nixos-x260/default.nix @@ -2,47 +2,52 @@ imports = [ ../../modules/apps ../../modules/desktop - ./hardware-configuration.nix # genereres på maskinen + ./hardware-configuration.nix # genereres på maskinen ]; # System boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_latest; + boot = { + plymouth = { + enable = true; + theme = "connect"; + themePackages = with pkgs; [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "connect" ]; + }) + ]; + }; + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "rd.udev.log_level=3" + "rd.systemd.show_status=auto" + ]; + loader.timeout = 0; + }; networking.hostName = "nixos-x260"; networking.networkmanager.enable = true; - time.timeZone = "Europe/Copenhagen"; - i18n.defaultLocale = "en_GB.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "da_DK.UTF-8"; - LC_IDENTIFICATION = "da_DK.UTF-8"; - LC_MEASUREMENT = "da_DK.UTF-8"; - LC_MONETARY = "da_DK.UTF-8"; - LC_NAME = "da_DK.UTF-8"; - LC_NUMERIC = "da_DK.UTF-8"; - LC_PAPER = "da_DK.UTF-8"; - LC_TELEPHONE = "da_DK.UTF-8"; - LC_TIME = "da_DK.UTF-8"; - }; - - console.keyMap = "dk-latin1"; - services.xserver.xkb = { - layout = "dk"; - variant = ""; - }; - # Bruger users.users.glennigen = { isNormalUser = true; description = "glennigen"; - extraGroups = [ "wheel" "networkmanager" ]; + extraGroups = [ + "wheel" + "networkmanager" + ]; shell = pkgs.fish; }; # Nix - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; # Tillad unfree packages (Steam, 1Password, mfl.) nixpkgs.config.allowUnfree = true; @@ -51,4 +56,4 @@ hardware.graphics.enable = true; system.stateVersion = "26.05"; -} \ No newline at end of file +} diff --git a/modules/apps/native.nix b/modules/apps/native.nix index 1a66d7a..c92e317 100644 --- a/modules/apps/native.nix +++ b/modules/apps/native.nix @@ -9,7 +9,10 @@ btop tldr neovim - + #powershell + #vscodium + #powershell-editor-services + #teams-for-linux # Git git gh @@ -20,13 +23,20 @@ # Utility stow + nixfmt ]; # Fish installeret via programs.fish — shell for glennigen programs.fish.enable = true; # Steam - programs.steam.enable = true; + programs.steam = { + enable = true; + extraPackages = with pkgs;[ + kdePackages.breeze + ]; + }; + # Tailscale (service, ikke package) services.tailscale.enable = true; @@ -35,4 +45,4 @@ security.polkit.enable = true; programs._1password.enable = true; programs._1password-gui.enable = true; -} \ No newline at end of file +} diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix index 9de9241..c560c28 100644 --- a/modules/desktop/kde.nix +++ b/modules/desktop/kde.nix @@ -1,23 +1,46 @@ -{ ... }: { +{ pkgs, ... }: { # KDE Plasma — desktop environment - services.xserver.enable = true; - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + services = { + xserver = { + enable = true; + xkb = { + layout = "dk"; + variant = "winkeys"; + }; + }; + displayManager = { + sddm.enable = true; + }; + desktopManager = { + plasma6.enable = true; + }; + }; - # SDDM tastaturlayout — drop-in config for at sikre dk uanset backend -# environment.etc."sddm.conf.d/99-keyboard.conf".text = '' -# [Input] -# Keyboard.layout=dk -# Keyboard.variant= -# ''; - environment.etc."X11/xorg.conf.d/00-keyboard.conf".text = '' - Section "InputClass" - Identifier "system-keyboard" - MatchIsKeyboard "on" - Option "XkbLayout" "dk" - Option "XkbModel" "pc105" - EndSection - ''; + environment.systemPackages = with pkgs.kdePackages; [ + filelight + partitionmanager + plasma-vault + plasma-firewall + ]; + + console.keyMap = "dk-latin1"; + time.timeZone = "Europe/Copenhagen"; + i18n.defaultLocale = "en_GB.UTF-8"; + i18n.extraLocaleSettings = { + #LC_ALL = "da_DK.UTF-8"; + #LC_CTYPE = "da_DK.UTF-8"; + LC_ADDRESS = "da_DK.UTF-8"; + LC_IDENTIFICATION = "da_DK.UTF-8"; + LC_MEASUREMENT = "da_DK.UTF-8"; + #LC_MESSAGES = "da_DK.UTF-8"; + LC_MONETARY = "da_DK.UTF-8"; + LC_NAME = "da_DK.UTF-8"; + LC_NUMERIC = "da_DK.UTF-8"; + LC_PAPER = "da_DK.UTF-8"; + LC_TELEPHONE = "da_DK.UTF-8"; + LC_TIME = "da_DK.UTF-8"; + #LC_COLLATE = "da_DK.UTF-8"; + }; # Lyd services.pulseaudio.enable = false; @@ -31,4 +54,4 @@ # Printing services.printing.enable = true; -} \ No newline at end of file +}