framework-2024-07-26-10-25-06

configs/common.nix

@@ -25,18 +25,6 @@
       openFirewall = true;
       extraConfig = "StreamLocalBindUnlink yes";
     };
-    # nextdns = {
-    #   enable = true;
-    #   arguments = [
-    #     "-config"
-    #     secrets.nextdnshash
-    #     "-cache-size"
-    #     "10MB"
-    #     "-listen"
-    #     "127.0.0.1:53"
-    #     "-report-client-info"
-    #   ];
-    # };
 
     dnscrypt-proxy2 = {
       enable = true;
@@ -62,7 +50,7 @@
   };
 
   networking = {
-    nameservers = [ "127.0.0.1" "::1" ];
+    nameservers = [ "127.0.0.1" ];
     # hosts = {
     #   "207.180.220.97" = [ "szczepan.ski" ];
     #   "10.100.0.1" = [ "vps.wg" ];

configs/gnome.nix

@@ -13,35 +13,40 @@
       };
 
       desktopManager.gnome.enable = true;
-      layout = "us";
+      xkb.layout = "us";
+
+      updateDbusEnvironment = true;
+    };
 
     # Enable touchpad support.
     libinput.enable = true;
-      updateDbusEnvironment = true;
-    };
   };
 
   environment.systemPackages = with pkgs; [
-    blackbox-terminal
+    # blackbox-terminal
     gnome.gnome-power-manager
     gnome.gnome-tweaks
     gnomeExtensions.appindicator
     gnomeExtensions.blur-my-shell
     gnomeExtensions.vitals
     gnomeExtensions.dash-to-dock
-    # gnomeExtensions.syncthing-indicator
+    gnomeExtensions.caffeine
+    gnomeExtensions.user-themes
+
     pantheon.elementary-icon-theme
 
-    flat-remix-icon-theme
+    # flat-remix-icon-theme
-    flat-remix-gtk
+    # flat-remix-gtk
-    flat-remix-gnome
+    # flat-remix-gnome
+    # juno-theme
+
+    trayscale
   ];
 
-  environment.gnome.excludePackages = (with pkgs; [ gnome-tour ])
+  environment.gnome.excludePackages = (with pkgs; [ gnome-tour gedit ])
     ++ (with pkgs.gnome; [
     cheese # webcam tool
     gnome-music
-    gedit # text editor
     epiphany # web browser
     gnome-characters
     totem # video player

configs/plasma-wayland.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }: {
+  programs = {
+    dconf.enable = true;
+    kdeconnect.enable = true;
+  };
+
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    plasma-browser-integration
+    konsole
+    oxygen
+    kate
+  ];
+
+  services = {
+    desktopManager.plasma6.enable = true;
+    displayManager = {
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
+    };
+
+    libinput.enable = true;
+  };
+}

configs/plasma.nix

@@ -11,8 +11,6 @@
     kate
   ];
 
-  # environment.etc."chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma-browser-integration}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json";
-
   services = {
     desktopManager.plasma6.enable = true;
     displayManager = {
@@ -36,6 +34,4 @@
 
     libinput.enable = true;
   };
-
-  environment.systemPackages = with pkgs; [ catppuccin-kde sweet-nova ];
 }

configs/user-gui.nix

@@ -68,27 +68,26 @@ in {
   };
 
   environment.systemPackages = with unstable.pkgs; [
-    xfce.catfish
+    alacritty
+    baobab
     czkawka # fslint before
-    discord
+    # discord
-    espeak-ng
+    # espeak-ng
+    gparted
+    grsync
     handbrake
     insomnia
+    keepassxc
     meld
     nextcloud-client
     pinta
-    signal-desktop
+    # remmina
-    solaar
-    remmina
-    spotify
-    baobab
-    keepassxc
-    grsync
-    virt-manager
     rustdesk-flutter
-    glxinfo
-    gparted
     simple-scan
+    # signal-desktop
+    # solaar
+    # spotify
+    virt-manager
   ];
 
   home-manager.users.alex = { pkgs, ... }: {

configs/user.nix

@@ -94,7 +94,7 @@ in {
         serverAliveInterval = 60;
         forwardAgent = true;
 
-        matchBlocks."szczepan.ski" = { hostname = "207.180.220.97"; };
+        matchBlocks."szczepan.ski" = { hostname = "szczepan.ski"; };
         matchBlocks."mini" = { hostname = "10.100.0.3"; };
         matchBlocks."thinkpad" = { hostname = "10.100.0.8"; };
         matchBlocks."pi" = { hostname = "10.100.0.6"; };

machine/framework.nix

@@ -15,7 +15,7 @@ in
     ../configs/docker.nix
     ../configs/games.nix
     ../configs/libvirt.nix
-    ../configs/pantheon.nix
+    ../configs/plasma-wayland.nix
     ../configs/user-gui.nix
     ../configs/user.nix
     /home/alex/Workspace/fw-fanctrl-nix/service.nix
@@ -57,7 +57,7 @@ in
           publicKey = wireguard.wireguard-vps-public;
           presharedKey = secrets.wireguard-preshared;
           allowedIPs = [ "10.100.0.0/24" ];
-          endpoint = "szczepan.ski:51820";
+          endpoint = "old.szczepan.ski:51820";
           persistentKeepalive = 25;
         }];
       };
@@ -70,6 +70,10 @@ in
     keyboard.qmk.enable = true;
     enableAllFirmware = true;
     cpu.intel.updateMicrocode = true;
+    openrazer = {
+      enable = true;
+      users = [ "alex" ];
+    };
 
     opengl = {
       enable = true;
@@ -86,6 +90,8 @@ in
     power-profiles-daemon.enable = true;
     colord.enable = true;
 
+    fwupd.enable = true;
+
     fw-fanctrl = {
       enable = true;
       configJsonPath = "/home/alex/nixos-config/config.json";
@@ -103,6 +109,31 @@ in
       pulse.enable = true;
     };
 
+    samba = {
+      enable = true;
+      securityType = "user";
+      extraConfig = ''
+        workgroup = WORKGROUP
+        server string = server
+        netbios name = server
+        security = user
+        guest account = nobody
+        map to guest = bad user
+        logging = systemd
+        max log size = 50
+      '';
+      shares = {
+        storage = {
+          path = "/home/alex/storage";
+          browseable = "yes";
+          "read only" = "no";
+          "guest ok" = "no";
+          "create mask" = "0644";
+          "directory mask" = "0755";
+        };
+      };
+    };
+
     borgbackup.jobs.home = rec {
       compression = "auto,zstd";
       encryption = {
@@ -139,8 +170,8 @@ in
   # systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
 
   environment.systemPackages = with unstable.pkgs; [
-    rustdesk
+    # rustdesk
-    cinnamon.warpinator
+    # cinnamon.warpinator
     psensor
     veracrypt
     gnumake
@@ -151,6 +182,8 @@ in
     # coreboot-toolchain.arm
     intel-gpu-tools
     msr-tools
+    quota
+    homebank
     (import ("/home/alex/Workspace/fw-ectool/default.nix"))
   ];
 
@@ -176,7 +209,7 @@ in
       IdleActionSec=2m
     '';
   };
-  systemd.sleep.extraConfig = "HibernateDelaySec=20m";
+  systemd.sleep.extraConfig = "HibernateDelaySec=60m";
 
   home-manager.users.alex.services.barrier.client = {
     enable = true;