Merge

flake.lock

@@ -88,11 +88,19 @@
     },
     "nixpkgs-unstable": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1724819573,
         "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+=======
+        "lastModified": 1725103162,
+        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+>>>>>>> 5655c8a056d725790ff88631d9bcc98875ef0333
         "type": "github"
       },
       "original": {

flake.nix

@@ -25,6 +25,7 @@
     };
   in 
   {
+    # Laptop Configuration
     nixosConfigurations = {
       xv-laptop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -33,12 +34,18 @@
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
 
           ./hosts/laptop
-          home-manager.nixosModules.home-manager
+        ];
-          {
+      };
-            home-manager.useGlobalPkgs = true;
+    };
-            home-manager.extraSpecialArgs = { inherit inputs nix-colors; };
+
-            home-manager.users.xeovalyte.imports = [ ./hosts/laptop/home.nix ];
+    homeConfigurations = {
-          }
+      "xeovalyte@xv-laptop" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+        
+          ./hosts/laptop/home.nix
         ];
       };
     };
@@ -54,6 +61,7 @@
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
+            home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = { inherit inputs nix-colors; };
             home-manager.users.xeovalyte.imports = [ ./hosts/desktop/home.nix ];
           }

homelab/caddy/docker-compose.yml

@@ -0,0 +1,19 @@
+services:
+  caddy:
+    image: caddy:2.8
+    container_name: caddy
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 80:80
+      - 443:443
+      - 443:443/udp
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - ./caddyfiles:/etc/caddy/
+
+volumes:
+  caddy_data:
+  caddy_config:

hosts/laptop/default.nix

@@ -8,6 +8,7 @@
     ../../modules/system/gui/hyprland.nix
     ../../modules/system/gui/steam.nix
     ../../modules/system/gui/thunar.nix
+    # ../../modules/system/gui/plasma.nix
     
     # CLI
     ../../modules/system/cli/common.nix
@@ -37,6 +38,7 @@
     enable = true;
     efiSupport = true;
     device = "nodev";
+    configurationLimit = 32;
   };
 
   networking.hostName = "xv-laptop"; # Define your hostname.
@@ -49,6 +51,13 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
+  # Configure wacom tablet
+  hardware.opentabletdriver = {
+    enable = true;
+  };
+
+  services.libinput.enable = true;
+
   system.stateVersion = "24.05";
 
 }

hosts/laptop/home.nix

@@ -15,6 +15,7 @@
     ../../modules/home/cli/ssh.nix
   ];
 
+
   options = {
     host = lib.mkOption {
       type = with lib.types; str;
@@ -32,7 +33,6 @@
 
     host = "xv-laptop";
 
-
     home.packages = with pkgs; [
       # Desktop Applications
       kdenlive
@@ -48,7 +48,7 @@
 
       # Office
       libreoffice
-      onlyoffice-bin
+      unstable.onlyoffice-bin
 
       # Image editing
       gimp
@@ -59,6 +59,9 @@
       unstable.drawio
     ];
 
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
     home.stateVersion = "24.05";
   };
 

modules/home/cli/common/shell.nix

@@ -11,11 +11,19 @@
   };
 
   programs.bash = {
+    enable = false;
+  };
+
+  programs.zsh = {
     enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
   };
 
   programs.starship = {
     enable = true;
     enableBashIntegration = true;
+    enableZshIntegration = true;
   };
 }

modules/home/cli/develop.nix

@@ -3,7 +3,6 @@
 {
   home.packages = with pkgs; [
     unstable.devenv
-    unstable.surrealist
     cloc
   ];
 

modules/home/gui/common/firefox.nix

@@ -105,8 +105,8 @@
             url = "https://youtube.com";
           }
           {
-            label = "Schoolportaal";
+            label = "My TU Delft";
-            url = "https://coenecoopcollege.sharepoint.com/";
+            url = "https://my.tudelft.nl/";
           }
         ];
         "signon.rememberSignons" = false;

modules/home/gui/common/fonts.nix

@@ -7,6 +7,7 @@
     noto-fonts
     fira-code
     font-awesome
+    dejavu_fonts
     (nerdfonts.override { fonts = [ "DejaVuSansMono" ]; })
   ];
 }

modules/home/gui/hyprland/default.nix

@@ -2,7 +2,6 @@
 
 {
   imports = [
-#    ./hyprpaper.nix
     ./waybar.nix
     ./fixes.nix
     ./dunst.nix
@@ -19,6 +18,8 @@
     nwg-bar
     powertop
     lxqt.lxqt-policykit
+
+    networkmanagerapplet
   ];
 
   wayland.windowManager.hyprland = {
@@ -33,6 +34,8 @@
       exec-once = [
         "waybar"
         "lxqt-policykit-agent"
+        "nm-applet"
+        "blueman-applet"
       ];
 
       env = lib.mkIf (config.host == "xv-desktop") [

modules/home/gui/hyprland/waybar.nix

@@ -70,7 +70,7 @@
               "warning" = 30;
               "critical" = 15;
           };
-          "format" = "{icon}  {capacity}%";
+          "format" = "{icon} {capacity}%";
           "format-icons" = [ "" "" "" "" "" ];
         };
         "pulseaudio" = {
@@ -93,8 +93,8 @@
         "network" = {
           "interface" = "wlan0";
           "format" = "{ifname}";
-          "format-wifi" = "  {essid}";
+          "format-wifi" = " {essid}";
-          "format-ethernet" = "󰊗  {ipaddr}/{cidr}";
+          "format-ethernet" = "󰊗 {ipaddr}/{cidr}";
           "format-disconnected" = "";
           "tooltip-format" = "{ifname} via {gwaddr}";
           "tooltip-format-wifi" = "{essid} ({signalStrength}%)";
@@ -107,7 +107,7 @@
     style = ''
       * {
         /* `otf-font-awesome` is required to be installed for icons */
-        font-family: DejaVuSansM Nerd Font;
+        font-family: DejaVuSans, FontAwesome6Free; 
       }
 
       #workspaces,#window,#clock,#battery,#tray,#pulseaudio,#network {

modules/home/gui/thunderbird.nix

@@ -35,6 +35,29 @@
       thunderbird.enable = true;
       thunderbird.profiles = [ "default" ];
     };
+    # tudelft = {
+    #   imap = {
+    #     host = "outlook.office365.com";
+    #     port = 993;
+    #     tls = {
+    #       enable = true;
+    #     };
+    #   };
+    #   smtp =  {
+    #     host = "smtp-a.tudelft.nl";
+    #     port = 465;
+    #     tls = {
+    #       enable = true;
+    #       useStartTls = false;
+    #     };
+    #   };
+    #   address = "tboomers@tudelft.nl";
+    #   realName = "Timo Boomers";
+    #   userName = "tboomers@tudelft.nl";
+    #   primary = false;
+    #   thunderbird.enable = true;
+    #   thunderbird.profiles = [ "default" ];
+    # };
     xeovalyte = {
       imap = {
         host = "mail.xeovalyte.dev";

modules/system/cli/common.nix

@@ -8,4 +8,9 @@
     btop
     git
   ];
+
+  environment.pathsToLink = [ "/share/zsh" ];
+
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
 }

modules/system/cli/docker.nix

@@ -1,7 +1,13 @@
 { ... }:
 
 {
-  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+    enable = true;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
 
   users.users.xeovalyte.extraGroups = [ "docker" ];
 }

modules/system/gui/hyprland.nix

@@ -8,16 +8,29 @@
   };
 
   # Configure display manager
-  services.greetd = {
+  # services.greetd = {
+  #   enable = true;
+  #   settings = {
+  #     default_session = {
+  #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
+  #       user = "xeovalyte";
+  #     };
+  #   };
+  # };
+
+  # SDDM configuration
+  environment.systemPackages = with pkgs; [
+    libsForQt5.qt5.qtquickcontrols2
+    libsForQt5.qt5.qtgraphicaleffects
+  ];
+
+  services.displayManager.sddm = {
     enable = true;
-    settings = {
+    wayland.enable = true;
-      default_session = {
+    theme = "${import ./sddm-theme.nix { inherit pkgs; }}";
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
-        user = "xeovalyte";
-      };
-    };
   };
 
+  # Sound configuration
   sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -28,6 +41,7 @@
     pulse.enable = true;
   };
 
+  # Keyring configuration
   security.polkit.enable = true;
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.greetd.enableGnomeKeyring = true;

modules/system/gui/plasma.nix

@@ -1,9 +1,9 @@
 { pkgs, ... }:
 
 {
-  services.xserver.enable = true;
-  
   services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  
   services.desktopManager.plasma6.enable = true;
 
   hardware.pulseaudio.enable = false;

modules/system/gui/sddm-theme.nix

@@ -0,0 +1,15 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation {
+  name = "sddm-theme";
+  src = pkgs.fetchFromGitHub {
+    owner = "MarianArlt";
+    repo = "sddm-sugar-dark";
+    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";    
+    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
+  };
+  installPhase = ''
+    mkdir -p $out
+    cp -R ./* $out/
+  '';
+}