Laptop back to using KDE Plasma

Rename emacs expression files

home/default.nix

@@ -1,16 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, wallpapers, ... }:
 
 {
-  imports = [
+  imports =
-    ./git/default.nix
+    [ ./git ./ssh ./tui ./tmux ./alacritty ./firefox ./zathura ./emacs ];
-    ./ssh/default.nix
-    ./tui/default.nix
-    ./tmux/default.nix
-    ./hyprland/default.nix
-    ./firefox/default.nix
-    ./zathura/default.nix
-    ./emacs/server.nix
-  ];
   home.packages = with pkgs; [ bitwarden signal-desktop libreoffice zotero ];
   programs.home-manager.enable = true;
+  xdg.configFile."wallpapers/default.jpg".source = wallpapers.outputs.default;
 }

home/emacs/default.nix

@@ -1,59 +1,12 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-
+  imports = [ ./dependencies.nix ];
-{
+  # Emacs28 package
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ emacs28NativeComp ];
-    # Emacs dependencies
+  # Emacs server service
-    emacs28NativeComp
+  services.emacs = {
-    git
+    enable = true;
-    ripgrep
+    package = pkgs.emacs28NativeComp;
-    coreutils
+    defaultEditor = true;
-    cmake
+    startWithUserSession = true;
-    fd
+  };
-    graphviz
-
-    # Mail server setup
-    isync
-    mu
-    protonmail-bridge
-
-    # Language-specific requirements
-    ispell
-    findutils
-    sqlite
-    pandoc
-    gfortran
-    texlive.combined.scheme-medium
-
-    # Formatters
-    nixfmt
-    beautysh
-    nodePackages.fixjson
-    fprettify
-    shellharden
-    stylua
-    python3Packages.mdformat
-
-    # LSP servers
-    nil
-    fortls
-    (python3.withPackages (ps:
-      with ps; [
-        python-lsp-server
-        python-lsp-ruff
-        python-lsp-black
-        pyls-isort
-        pylsp-rope
-        pylsp-mypy
-      ]))
-    nodePackages.yaml-language-server
-    nodePackages.bash-language-server
-    nodePackages.vscode-html-languageserver-bin
-    nodePackages.vscode-css-languageserver-bin
-    nodePackages.vscode-json-languageserver-bin
-    nodePackages.dockerfile-language-server-nodejs
-    shellcheck
-    marksman
-    luajitPackages.lua-lsp
-    texlab
-  ];
 }

home/emacs/dependencies.nix

@@ -0,0 +1,58 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    # Emacs dependencies
+    git
+    ripgrep
+    coreutils
+    cmake
+    fd
+    graphviz
+
+    # Mail server setup
+    isync
+    mu
+    protonmail-bridge
+
+    # Language-specific requirements
+    ispell
+    findutils
+    sqlite
+    pandoc
+    gfortran
+    texlive.combined.scheme-medium
+
+    # Formatters
+    nixfmt
+    beautysh
+    nodePackages.fixjson
+    fprettify
+    shellharden
+    stylua
+    python3Packages.mdformat
+
+    # LSP servers
+    nil
+    fortls
+    (python3.withPackages (ps:
+      with ps; [
+        python-lsp-server
+        python-lsp-ruff
+        python-lsp-black
+        pyls-isort
+        pylsp-rope
+        pylsp-mypy
+      ]))
+    nodePackages.yaml-language-server
+    nodePackages.bash-language-server
+    nodePackages.vscode-html-languageserver-bin
+    nodePackages.vscode-css-languageserver-bin
+    nodePackages.vscode-json-languageserver-bin
+    nodePackages.dockerfile-language-server-nodejs
+    shellcheck
+    marksman
+    luajitPackages.lua-lsp
+    texlab
+  ];
+}

home/emacs/server.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  imports = [ ./default.nix ];
-  # Emacs server service
-  services.emacs = {
-    enable = true;
-    package = pkgs.emacs28NativeComp;
-    defaultEditor = true;
-    startWithUserSession = true;
-  };
-}

hosts/Legion/home.nix

@@ -4,7 +4,7 @@
 in {
   imports = [
     shellConfig
-    ../../home/emacs/server.nix
+    ../../home/emacs
     ../../home/git
     ../../home/ssh
     ../../home/tui

hosts/Monarch/home.nix

@@ -5,16 +5,16 @@ let
 in {
   imports = [
     ../../home/shell/zsh.nix
-    ../../home/git/default.nix
+    ../../home/git
-    ../../home/ssh/default.nix
+    ../../home/ssh
-    ../../home/tui/default.nix
+    ../../home/tui
-    ../../home/alacritty/macos.nix
+    ../../home/alacritty
-    ../../home/emacs/default.nix
+    ../../home/emacs/dependencies.nix
   ];
   home = {
     inherit username homeDirectory;
     stateVersion = "23.05";
-    packages = with pkgs; [coreutils-prefixed];
+    packages = with pkgs; [ emacs28NativeComp coreutils-prefixed ];
   };
   programs = {
     home-manager.enable = true;

hosts/Ronin/configuration.nix

@@ -9,7 +9,7 @@ in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../hyprland.nix
+    ../plasma.nix
     ../../services/${hostName}.nix
   ];
   # Bootloader.
@@ -32,13 +32,6 @@ in {
   '';
   programs.light.enable = true;
   users.users.${user} = userConfig;
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session.user = user;
-      initial_session.user = user;
-    };
-  };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

hosts/Ronin/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, shellConfig, wallpapers, ... }:
+{ pkgs, lib, shellConfig, ... }:
 let
   username = "elitherl";
   homeDirectory = "/home/${username}";
@@ -81,7 +81,8 @@ in {
           {
             name = "Physics Summary";
             tags = [ "JET" "operations" ];
-            url = "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
+            url =
+              "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
           }
           {
             name = "JSPO";
@@ -145,57 +146,4 @@ in {
       }];
     };
   };
-  services.kanshi.profiles = {
-    undocked = {
-      outputs = [{
-        criteria = "eDP-1";
-        mode = "1920x1080";
-        position = "0,0";
-        scale = 1.0;
-        status = "enable";
-      }];
-      exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
-    };
-    work = {
-      outputs = [
-        {
-          criteria = "eDP-1";
-          status = "disable";
-        }
-        {
-          criteria = "Iiyama North America PLB2403WS 0574281251316";
-          position = "1280,185";
-          status = "enable";
-        }
-        {
-          criteria = "Dell Inc. DELL U2417H 5K9YD872FY1L";
-          position = "3200,0";
-          status = "enable";
-        }
-      ];
-      exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
-    };
-    home = {
-      outputs = [
-        {
-          criteria = "Acer Technologies ED270R TJMEE0043W01";
-          position = "0,0";
-          status = "enable";
-        }
-        {
-          criteria = "eDP-1";
-          status = "disable";
-        }
-      ];
-      exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
-    };
-  };
-  xdg.configFile."hypr/display.conf".text = ''
-    monitor=eDP-1,preferred,auto,1
-    monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,1280x185,1
-    monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,3200x0,1,transform,1
-    monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
-
-    bindl=,switch:Lid Switch,exec,hyprctl reload
-  '';
 }

hosts/plasma.nix

@@ -1,11 +1,18 @@
 { pkgs, ... }: {
   imports = [ ./desktop.nix ];
-  services.xserver.desktopManager.plasma5.enable = true;
+  environment.systemPackages = with pkgs;
-  # programs.kdeconnect.enable = true;
+    with libsForQt5; [
-  environment.systemPackages = [
+      lightly
-    pkgs.libsForQt5.lightly
+      kwindowsystem
-    pkgs.libsForQt5.kwindowsystem
+      krdc
-    # pkgs.libsForQt5.ktorrent
-    pkgs.libsForQt5.krdc
     ];
+  services.xserver = {
+    enable = true;
+    desktopManager.plasma5.enable = true;
+    displayManager.sddm = {
+      enable = true;
+      # theme = "catppuccin-macchiato";
+      settings = { General = { InputMethod = ""; }; };
+    };
+  };
 }