updated hm sway

home/fonts.nix

@@ -0,0 +1,33 @@
+{ pkgs, lib, ... }:
+{
+  
+    home.packages = with pkgs; [
+        nerdfonts
+        noto-fonts
+        noto-fonts-cjk
+        noto-fonts-emoji
+        liberation_ttf
+        fira-code
+        fira-code-symbols
+        nerdfonts
+        ubuntu_font_family
+        zpix-pixel-font
+        _0xproto
+        font-awesome
+        font-awesome_5
+        font-awesome_4
+
+    ];
+
+  fonts.fontconfig.enable = true;
+  fonts.fontconfig.defaultFonts = {
+      emoji = ["noto-fonts-emoji font-awesome"];
+      monospace = ["0xproto" "zpix" "fira-code"];
+      serif = [ "Noto Serif" "Source Han Serif" ];
+      sansSerif = [ "Noto Sans" "Source Han Sans" ];
+  };
+
+ 
+
+}
+

home/foot.nix

@@ -0,0 +1,42 @@
+{ pkgs, lib, ... }:
+{
+    home.packages = with pkgs; [
+        foot
+    ];
+    
+    programs.foot.enable = true;
+    programs.foot.settings = {
+       colors = {
+           alpha="0.9";
+           foreground="ffffff";
+           background="000000";
+           regular0="2e3436";
+           regular1="cc0000";
+           regular2="c4e9a06";
+           regular3="cc4a000";
+           regular4="c3465a4";
+           regular5="c75507b";
+           regular6="c06989a";
+           regular7="cd3d7cf";
+           bright0="555753";
+           bright1="5ef2929";
+           bright2="58ae234";
+           bright3="5fce94f";
+           bright4="5729fcf";
+           bright5="5ad7fa8";
+           bright6="534e2e2";
+           bright7="5eeeeec";
+       };
+       main = {
+           term = "xterm-256color";
+           font = "0xproto:size=16";
+           dpi-aware = "yes";
+       };
+       mouse = {
+           hide-when-typing = "yes";
+       };
+     };
+
+ 
+}
+

home/kanshi.nix

@@ -0,0 +1,35 @@
+{ pkgs, lib, ... }:
+{
+    home.packages = with pkgs; [
+    ];
+
+     services.kanshi = {
+        enable = true;
+        settings = [
+              { profile.name = "undocked";
+                  profile.outputs = [
+                    {
+                      criteria = "eDP-1";
+                    }
+                  ];
+                  profile.exec = [
+                        "\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 2, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 3, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 4, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 5, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 6, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 7, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 8, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 9, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 10, move workspace to eDP-1"
+                        "\${pkg.sway}/bin/swaymsg workspace 0, move workspace to eDP-1"
+
+                  ];
+            }
+         ];
+
+    };
+   
+}
+

home/sway.nix

@@ -1,58 +1,62 @@
-{ pkgs, lib, ... }:
+{ pkgs, config, lib, ... }:
 {
     imports = [
-        
+       ./wofi.nix 
+       ./foot.nix 
+       ./fonts.nix 
+       ./kanshi.nix 
     ];
 
   
     home.packages = with pkgs; [
       wl-clipboard
-        wlr-randr
-
     	libsForQt5.qt5ct
     	qt6Packages.qt6ct
+    	pass-wayland
 
-    	waybar
+      #term
-    	networkmanagerapplet
-    	networkmanager
-    	libsForQt5.networkmanager-qt
-    	
-    	wdisplays
-        kanshi
-    
-    	swaylock-effects
-        swayidle
-    	#swaylock-fancy #migth change to this default may look prettier.
-    	
     	foot
     	## possible other options
     	#kitty
     	#alacrity
     	
+
+      #disply and background
+    	wdisplays
+      kanshi
+      wlr-randr
+      swaybg
+
+      #bar applets and notifications
+    	waybar
+    	networkmanagerapplet
+    	networkmanager
+    	libsForQt5.networkmanager-qt
+      mako 
+
+      #lockscreen and related
+    	wleave	
+      swayidle
+    	swaylock-effects
+    	#swaylock-fancy #migth change to this default may look prettier.
+
+      #ligth and sound
+    	brightnessctl     
+    	pavucontrol
+
+      #sway automation
+    	autotiling-rs
+      swayest-workstyle
+
+      #launcher
     	wofi
     	wofi-emoji
     	bemoji
 
-    	brightnessctl     
-    	pavucontrol
-    	
       #screenshots	
     	grim
     	slurp
 
-        mako 
-    	
-        swaybg
-    
-        swayest-workstyle
-    	autotiling-rs
-    	wleave	
-    	
-    	pass-wayland
-
-
-
-
       #fonts
       nerdfonts
       noto-fonts
@@ -74,134 +78,6 @@
   qt.enable = true;
   qt.style.name = "breeze";
 
-  programs.wofi = {
-        enable = true;
-        settings = {
-            location = "center";
-            allow_markup = true;
-            width = "80%";
-          };
-        style = ''
-                  * {
-                      font-family: monospace;
-                      font-size: 1.5em;
-                  }
-
-                  window {
-                      margin: 0px;
-                      border: 1px solid #c0c0c0;
-                      background-color: #282a36;
-                  }
-                  
-                  #input {
-                      margin: 2 px;
-                      border: none;
-                      color: #222222;
-                      background-color: #eeeeee;
-                  }
-                  
-                  #inner-box {
-                      margin: 2px;
-                      border: none;
-                      background-color: #282a36;
-                  }
-                  
-                  #outer-box {
-                      margin: 2px;
-                      border: none;
-                      background-color: #282a36;
-                  }
-                  
-                  #scroll {
-                      margin: 0px;
-                      border: none;
-                  }
-                  
-                  #text {
-                      margin: 2px;
-                      border: none;
-                      color: #f8f8f2;
-                  }
-                  
-                  #entry:selected {
-                      background-color: #44475a;
-                  }
-                  #entry {
-                      border-bottom-style: solid;
-                      border-width: 1px;
-                      border-color: #d4af37;
-                  }
-            '';
-    };
-
-    services.kanshi = {
-        enable = true;
-        settings = [
-              { profile.name = "undocked";
-                  profile.outputs = [
-                    {
-                      criteria = "eDP-1";
-                    }
-                  ];
-                  profile.exec = [
-                        "\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 2, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 3, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 4, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 5, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 6, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 7, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 8, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 9, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 10, move workspace to eDP-1"
-                        "\${pkg.sway}/bin/swaymsg workspace 0, move workspace to eDP-1"
-
-                  ];
-            }
-         ];
-
-    };
-
-    programs.foot.settings = {
-       colors = {
-           alpha="0.9";
-           foreground="ffffff";
-           background="000000";
-           regular0="2e3436";
-           regular1="cc0000";
-           regular2="c4e9a06";
-           regular3="cc4a000";
-           regular4="c3465a4";
-           regular5="c75507b";
-           regular6="c06989a";
-           regular7="cd3d7cf";
-           bright0="555753";
-           bright1="5ef2929";
-           bright2="58ae234";
-           bright3="5fce94f";
-           bright4="5729fcf";
-           bright5="5ad7fa8";
-           bright6="534e2e2";
-           bright7="5eeeeec";
-       };
-       main = {
-           term = "xterm-256color";
-           font = "0xproto:size=16";
-           dpi-aware = "yes";
-       };
-       mouse = {
-           hide-when-typing = "yes";
-       };
-     };
-
-
-  fonts.fontconfig.enable = true;
-  fonts.fontconfig.defaultFonts = {
-      emoji = ["noto-fonts-emoji font-awesome"];
-      monospace = ["0xproto" "zpix" "fira-code"];
-      serif = [ "Noto Serif" "Source Han Serif" ];
-      sansSerif = [ "Noto Sans" "Source Han Sans" ];
-  };
 
   home.sessionVariables = {
     MOZ_ENABLE_WAYLAND = "1";
@@ -224,13 +100,13 @@
   };
 
     
-    
+wayland.windowManager.sway = let 
-  wayland.windowManager.sway = {
+  cfg = config.wayland.windowManager.sway;
+in {
   wrapperFeatures.gtk = true;
   enable = true;
   config = rec {
     modifier = "Mod4";
-      # Use kitty as default terminal
     terminal = "footclient"; 
     menu = "wofi --show run";
     bars = [{
@@ -239,7 +115,6 @@
         position = "top";
       }];
     startup = [
-        # Launch Firefox on start
       {command = "foot --server";}
       {command = "firefox";}
       {command = "nm-applet";}
@@ -252,61 +127,143 @@
     modes.resize = {
       Escape = "mode default";
       Return = "mode default";
-        "h" = "resize shrink width 10 px or 10 ppt";
+      "${cfg.config.left}" = "resize shrink width 10 px or 10 ppt";
-        "j" = "resize grow height 10 px or 10 ppt";
+      "${cfg.config.down}" = "resize grow height 10 px or 10 ppt";
-        "k" = "resize shrink height 10 px or 10 ppt";
+      "${cfg.config.up}" = "resize shrink height 10 px or 10 ppt";
-        "l" = "resize grow width 10 px or 10 ppt";
+      "${cfg.config.right}" = "resize grow width 10 px or 10 ppt";
     };
+    keybindings = {
+        "${cfg.config.modifier}+Return" = "exec ${cfg.config.terminal}";
+        "${cfg.config.modifier}+Shift+q" = "kill";
+        "${cfg.config.modifier}+d" = "exec ${cfg.config.menu}";
 
+        "${cfg.config.modifier}+${cfg.config.left}" = "focus left";
+        "${cfg.config.modifier}+${cfg.config.down}" = "focus down";
+        "${cfg.config.modifier}+${cfg.config.up}" = "focus up";
+        "${cfg.config.modifier}+${cfg.config.right}" = "focus right";
+
+        "${cfg.config.modifier}+Left" = "focus left";
+        "${cfg.config.modifier}+Down" = "focus down";
+        "${cfg.config.modifier}+Up" = "focus up";
+        "${cfg.config.modifier}+Right" = "focus right";
+
+        "${cfg.config.modifier}+Shift+${cfg.config.left}" = "move left";
+        "${cfg.config.modifier}+Shift+${cfg.config.down}" = "move down";
+        "${cfg.config.modifier}+Shift+${cfg.config.up}" = "move up";
+        "${cfg.config.modifier}+Shift+${cfg.config.right}" = "move right";
+
+        "${cfg.config.modifier}+Shift+Left" = "move left";
+        "${cfg.config.modifier}+Shift+Down" = "move down";
+        "${cfg.config.modifier}+Shift+Up" = "move up";
+        "${cfg.config.modifier}+Shift+Right" = "move right";
+
+        "${cfg.config.modifier}+b" = "splith";
+        "${cfg.config.modifier}+v" = "splitv";
+        "${cfg.config.modifier}+f" = "fullscreen toggle";
+        "${cfg.config.modifier}+a" = "focus parent";
+
+        "${cfg.config.modifier}+s" = "layout stacking";
+        "${cfg.config.modifier}+w" = "layout tabbed";
+        "${cfg.config.modifier}+e" = "layout toggle split";
+
+        "${cfg.config.modifier}+Shift+space" = "floating toggle";
+        "${cfg.config.modifier}+space" = "focus mode_toggle";
+
+        "${cfg.config.modifier}+1" = "workspace number 1";
+        "${cfg.config.modifier}+2" = "workspace number 2";
+        "${cfg.config.modifier}+3" = "workspace number 3";
+        "${cfg.config.modifier}+4" = "workspace number 4";
+        "${cfg.config.modifier}+5" = "workspace number 5";
+        "${cfg.config.modifier}+6" = "workspace number 6";
+        "${cfg.config.modifier}+7" = "workspace number 7";
+        "${cfg.config.modifier}+8" = "workspace number 8";
+        "${cfg.config.modifier}+9" = "workspace number 9";
+        "${cfg.config.modifier}+0" = "workspace number 10";
+
+        "${cfg.config.modifier}+Shift+1" = "move container to workspace number 1";
+        "${cfg.config.modifier}+Shift+2" = "move container to workspace number 2";
+        "${cfg.config.modifier}+Shift+3" = "move container to workspace number 3";
+        "${cfg.config.modifier}+Shift+4" = "move container to workspace number 4";
+        "${cfg.config.modifier}+Shift+5" = "move container to workspace number 5";
+        "${cfg.config.modifier}+Shift+6" = "move container to workspace number 6";
+        "${cfg.config.modifier}+Shift+7" = "move container to workspace number 7";
+        "${cfg.config.modifier}+Shift+8" = "move container to workspace number 8";
+        "${cfg.config.modifier}+Shift+9" = "move container to workspace number 9";
+        "${cfg.config.modifier}+Shift+0" = "move container to workspace number 10";
+
+        "${cfg.config.modifier}+Shift+minus" = "move scratchpad";
+        "${cfg.config.modifier}+minus" = "scratchpad show";
+
+        "${cfg.config.modifier}+Shift+r" = "reload";
+        "${cfg.config.modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
+
+        "${cfg.config.modifier}+r" = "mode resize";
+
+        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
+        "F3" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
+        "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
+        "F2" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
+        "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
+        "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+        "XF86MonBrightnessDown" = "exec brightnessctl set 5%-";
+        "XF86MonBrightnessUp" = "exec brightnessctl set 5%+";
+        "XF86AudioPlay" = "exec playerctl play-pause";
+        "XF86AudioNext" = "exec playerctl next";
+        "XF86AudioPrev" = "exec playerctl previous";
+        "XF86Search" = "exec ${cfg.config.menu}";
+
+        "${cfg.config.modifier}+Shift+f" = "exec firefox";
+        "${cfg.config.modifier}+Shift+c" = "exec code";
+        "${cfg.config.modifier}+f11" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
+        "${cfg.config.modifier}+Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
+        "Mod1+tab" = "workspace back_and_forth";
+        };
   };
 
   extraConfig = ''
     set $mod Mod4
-
-        #startup
     input type:keyboard xkb_capslock disabled
     input type:keyboard xkb_numlock enabled
     xwayland enable
     
-        #autostart to selected workspace classes
     assign [class="autostart1"] workspace 1
     assign [class="autostart2"] workspace 2
     assign [class="autostart3"] workspace 3
     assign [class="autostart4"] workspace 4
     
+    smart_borders no_gaps 
+    smart_gaps on
+    gaps inner 5
+    default_border pixel 1
+    default_floating_border pixel 2
+    titlebar_border_thickness 1
 
-        bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+    client.focused          #80a0ff     #303030     #c6c6c6     #80a0ff     #80a0ff
-        bindsym F3 exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+    client.focused_inactive #80a0ff     #303030     #c6c6c6     #80a0ff     #80a0ff
-        bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+    client.unfocused        #80a0ff     #080808     #c6c6c6     #80a0ff     #303030
-        bindsym F2 exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+    client.urgent           #80a0ff     #80a0ff     #080808     #80a0ff
-        bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-        bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-        bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
-        bindsym XF86MonBrightnessUp exec brightnessctl set 5%+
-        bindsym XF86AudioPlay exec playerctl play-pause
-        bindsym XF86AudioNext exec playerctl next
-        bindsym XF86AudioPrev exec playerctl previous
-        bindsym XF86Search exec $menu
 
-        #shortcuts for applications
+    for_window [title="(?:Open|Save) (?:File|Folder|As)"] floating enable
-        #bindsym $mod+Shift+f exec firefox
+    for_window [title="(?:Open|Save) (?:File|Folder|As)"] resize set 1920 1080
-        #bindsym $mod+Shift+c exec code
+    for_window [window_role="pop-up"] floating enable
+    for_window [window_role="bubble"] floating enable
+    for_window [window_role="task_dialog"] floating enable
+    for_window [window_role="Preferences"] floating enable
+    for_window [window_type="dialog"] floating enable
+    for_window [window_type="menu"] floating enable
+    for_window [app_id="xdg-desktop-portal-gtk"] floating enable
+    for_window [app_id="xdg-desktop-portal-gtk"] resize set 1920 1080
+    for_window [app_id="bitwarden"] floating enable
+    for_window [app_id="dolphin"] floating enable
+    for_window [app_id="file-manager"] floating enable
 
-
+    #client.focused $accent $accent #000000 #00ffcc $accent
-
+    #client.focused_inactive #000000 #000000 #ff9900 #000000 #000000
-        #screenshot
+    #client.unfocused #000000 #000000 #00ffcc #000000 #000000
-        bindsym $mod+f11 exec grim -g "$(slurp)" ~/Pictures/screenshots/"screenshot-`date +%F-%T`".png
+    #client.urgent #ff0000 #ff0000 #00ffcc #ff0000 #ff0000
-        bindsym $mod+Print exec grim -g "$(slurp)" ~/Pictures/screenshots/"screenshot-`date +%F-%T`".png
+    #client.placeholder #000000 #000000 #00ffcc #000000 #000000
-
+    #client.background #000000
-        # Alt tab window switching.
-        #bindsym $mod+tab workspace next_on_output 
-        #bindsym $mod+Shift+tab workspace prev_on_output
-        bindsym Mod1+tab workspace back_and_forth
   '';
-
+};
-
-  };
-
-
 }
 

home/wofi.nix

@@ -0,0 +1,71 @@
+{ pkgs, lib, ... }:
+{
+    home.packages = with pkgs; [
+    	wofi
+    	wofi-emoji
+    	bemoji
+    ];
+
+  programs.wofi = {
+        enable = true;
+        settings = {
+            location = "center";
+            allow_markup = true;
+            width = "80%";
+          };
+        style = ''
+                  * {
+                      font-family: monospace;
+                  }
+
+                  window {
+                      margin: 0px;
+                      border: 1px solid #c0c0c0;
+                      background-color: #282a36;
+                      border-radius: 10%;
+                  }
+                  
+                  #input {
+                      margin: 2 px;
+                      border: none;
+                      color: #222222;
+                      background-color: #eeeeee;
+                  }
+                  
+                  #inner-box {
+                      margin: 2px;
+                      border: none;
+                      background-color: #282a36;
+                  }
+                  
+                  #outer-box {
+                      margin: 2px;
+                      border: none;
+                      background-color: #282a36;
+                  }
+                  
+                  #scroll {
+                      margin: 0px;
+                      border: none;
+                  }
+                  
+                  #text {
+                      margin: 2px;
+                      border: none;
+                      color: #f8f8f2;
+                  }
+                  
+                  #entry:selected {
+                      background-color: #44475a;
+                  }
+                  #entry {
+                      border-bottom-style: solid;
+                      border-width: 1px;
+                      border-color: #d4af37;
+                  }
+            '';
+    };
+
+   
+}
+

machines/eowyn/configuration.nix

@@ -24,44 +24,6 @@
   # Set your time zone.
   time.timeZone = "Europe/Oslo";
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound.
-  # hardware.pulseaudio.enable = true;
-  # OR
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.gunalx = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
-      firefox
-      tree
-    ];
-  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -76,9 +38,25 @@
     foot
 
     libfprint
+    fprintd
 
   ];
 
+
+  users.users.gunalx = {
+    isNormalUser = true;
+    description = "Adrian Gunnar Lauterer";
+    extraGroups = [ "networkmanager" "wheel" "video" ];
+    packages = with pkgs; [
+    ];
+  };
+
+
+
+  services.fprintd.enable = true;
+
+
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -87,11 +65,6 @@
   #   enableSSHSupport = true;
   # };
   
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

packages/vim.nix

@@ -15,7 +15,7 @@
         set backspace=indent,eol,start
         " Turn on syntax highlighting by default
         syntax on
-        set tabstop=4 softtabstop=0 autoindent  expandtab shiftwidth=4 smarttab
+        set tabstop=2 softtabstop=0 autoindent  expandtab shiftwidth=2 smarttab
         " ...
       '';
       packages.myplugins = with pkgs.vimPlugins; {

profiles/desktop.nix

@@ -3,13 +3,11 @@
 imports =
     [
       ./base.nix 
-      ./sound.nix #all i would ever need in sound.
+      ./sound.nix
-      ./video.nix #all i would ever need in sound.
+      ./video.nix 
-      ./office.nix #all i would ever need in sound.
+      ./office.nix 
 
       ../packages/vim.nix
-      #../home/home-full.nix
-      #./sway.nix
       ../packages/steam.nix
       
     ];
@@ -18,8 +16,8 @@ imports =
     openscad
     cura
 
-    libsForQt5.qt5ct
+    #libsForQt5.qt5ct
-    qt6Packages.qt6ct
+    #qt6Packages.qt6ct
   ];
 
   fonts.packages = with pkgs; [
@@ -42,12 +40,12 @@ imports =
 
   security.polkit.enable = true;
   
-
+  services.displayManager.sddm.wayland.enable = true;
   services.displayManager.sddm.enable = true;
   services.desktopManager.plasma6.enable = true;
   services.desktopManager.plasma6.enableQt5Integration = true;
 
-  qt.platformTheme = "qt5ct";
+  qt.platformTheme = "kde";
 
   # Configure keymap in X11
   services.xserver.xkb = {