flake.lock

@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690084763,
+        "lastModified": 1689891262,
-        "narHash": "sha256-Nw680m/pyVoosSgXZW415Z657mfVM2BxaxDPjEk48Z0=",
+        "narHash": "sha256-Pc4wDczbdgd6QXKJIXprgxe7L9AVDsoAkMnvm5vmpUU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fb03fa5516d4e86059d24ab35a611ffa3a359547",
+        "rev": "ee5673246de0254186e469935909e821b8f4ec15",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690031011,
+        "lastModified": 1689850295,
-        "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=",
+        "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "12303c652b881435065a98729eb7278313041e49",
+        "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1689956312,
+        "lastModified": 1689885880,
-        "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=",
+        "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=",
         "owner": "NixOS",
         "repo": "nIxpkgs",
-        "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967",
+        "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1690134339,
+        "lastModified": 1689968828,
-        "narHash": "sha256-+zAALvCHP+SzdsrRIVOHsBMEH2uADAQa29n1m94w7nc=",
+        "narHash": "sha256-5qA6R/cBeLsS09ZMRKzhJq74nOGWEgGYpjdbKXDnCow=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dd0c314217c07e3c4e84d288f8c4ec9119b109c3",
+        "rev": "876b9498f36a394fcf8472f62ecf6685585c0509",
         "type": "github"
       },
       "original": {

hosts/configuration_desktop.nix

@@ -51,11 +51,11 @@
     pki.certificateFiles = [
       ./rootCA.pem
     ];
-    #tpm2 = {
+    tpm2 = {
-    #    enable = true;
+        enable = true;
-    #    pkcs11.enable = true;
+        pkcs11.enable = true;
-    #    tctiEnvironment.enable = true;
+        tctiEnvironment.enable = true;
-    #  };
+      };
   };
 
   sound = {                                 # ALSA sound enable

hosts/steamdeck/default.nix

@@ -22,7 +22,8 @@
 {
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/desktop/gnome/default.nix)] ++        # Window Manager
+    #[(import ../../modules/desktop/hyprland/default.nix)] ++        # Window Manager
+    [(import ../../modules/desktop/sway/default.nix)] ++        # Window Manager
     [(import ../../modules/desktop/virtualisation/default.nix)] ++   # Docker
     (import ../../modules/hardware);                                # Hardware devices
 
@@ -62,6 +63,7 @@
       enableSSHSupport = true;
       pinentryFlavor = "curses";
     };
+    steam.enable = true;
   };
 
   services = {

hosts/steamdeck/hardware-configuration.nix

@@ -22,76 +22,70 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.kernelParams = [  ];
   boot.tmp.useTmpfs = true;
-#  zramSwap.enable = true;
+  zramSwap.enable = true;
 
-#  services.btrfs.autoScrub = {
+  services.btrfs.autoScrub = {
-#    enable = true;
+    enable = true;
-#    interval = "monthly";
+    interval = "monthly";
-#    fileSystems = [
+    fileSystems = [
-#      "/"
+      "/"
-#    ];
+    ];
-#  };
+  };
-#
-#  services.btrbk = {
-#      instances = {
-#          hf = {
-#              onCalendar = "hourly";
-#              settings = {
-#                  incremental = "yes";
-#                  snapshot_create = "ondemand";
-#                  snapshot_dir = "@snapshots";
-#                  timestamp_format = "long";
-#
-#                  snapshot_preserve = "2m 2w 5d 5h";
-#                  snapshot_preserve_min = "latest";
-#                
-#                  volume =  {
-#                      "/mnt/snapshots/root" = {
-#                          snapshot_create = "always";
-#                          subvolume = {
-#                              "@home" = {};
-#                          };
-#                      };
-#                  };
-#              };
-#          };
-#      };
-#  };
 
-#  fileSystems."/" =
+  services.btrbk = {
-#    { device = "/dev/disk/by-label/NIXROOT";
+      instances = {
-#      fsType = "btrfs";
+          hf = {
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+              onCalendar = "hourly";
-#    };
+              settings = {
-#
+                  incremental = "yes";
-#  fileSystems."/home" =
+                  snapshot_create = "ondemand";
-#    { device = "/dev/disk/by-label/NIXROOT";
+                  snapshot_dir = "@snapshots";
-#      fsType = "btrfs";
+                  timestamp_format = "long";
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+
-#    };
+                  snapshot_preserve = "2m 2w 5d 5h";
-#
+                  snapshot_preserve_min = "latest";
-#  fileSystems."/srv" =
+                
-#    { device = "/dev/disk/by-label/NIXROOT";
+                  volume =  {
-#      fsType = "btrfs";
+                      "/mnt/snapshots/root" = {
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+                          snapshot_create = "always";
-#    };
+                          subvolume = {
-#
+                              "@home" = {};
-#  fileSystems."/nix" =
+                          };
-#    { device = "/dev/disk/by-label/NIXROOT";
+                      };
-#      fsType = "btrfs";
+                  };
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+              };
-#    };
+          };
-#
+      };
-#  fileSystems."/mnt/snapshots/root" =
+  };
-#    { device = "/dev/disk/by-label/NIXROOT";
-#      fsType = "btrfs";
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
-#    };
 
   fileSystems."/" =
     { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "ext4";
+      fsType = "btrfs";
-      options = [ "defaults,noatime" ];
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    };
+
+  fileSystems."/srv" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    };
+
+  fileSystems."/mnt/snapshots/root" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
     };
 
   fileSystems."/boot" =
@@ -102,21 +96,22 @@
   fileSystems."/sdcard" =
     { device = "/dev/disk/by-label/sdcard";
       fsType = "ext4";
-      options = [ "nofail,x-systemd.automount" ];
+      options = [ "nofail" "x-systemd.automount" ];
     };
 
   fileSystems."/mnt/Pluto" =
     { device = "nas:/Pluto";
       fsType = "nfs";
-      options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
     };
 
   fileSystems."/mnt/Mars" =
     { device = "nas:/Mars";
       fsType = "nfs";
-      options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
+      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
     };
 
+
   swapDevices = [
     { device = "/dev/disk/by-label/NIXSWAP"; }
   ];

hosts/steamdeck/home.nix

@@ -17,7 +17,7 @@
   imports =
     [
       #../../modules/desktop/hyprland/home.nix # Window Manager
-      ../../modules/desktop/gnome/home.nix # Window Manager
+      ../../modules/desktop/sway/home.nix # Window Manager
       ../../modules/home.nix # Window Manager
     ];
 
@@ -31,6 +31,7 @@
       streamlink
       streamlink-twitch-gui-bin
       element-desktop
+      intel-gpu-tools
       pulsemixer
       
       # Display

modules/desktop/gnome/default.nix

@@ -1,54 +0,0 @@
-#
-#  Gnome configuration
-#
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./laptop
-#   │       └─ default.nix
-#   └─ ./modules
-#       └─ ./desktop
-#           └─ ./gnome
-#               └─ default.nix *
-#
-{ config, lib, user, pkgs, jovian-nixos, ... }:
-
-{
-    imports = [ 
-      (jovian-nixos + "/modules")
-    ];
-
-    jovian = {
-        steam.enable = true;
-        devices.steamdeck = {
-            enable = true;
-        };
-    };
-
-    hardware.opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-    };
-
-    environment.systemPackages = with pkgs; [
-      gnome.gnome-terminal
-      gnomeExtensions.dash-to-dock
-      steamdeck-firmware
-      rocm-opencl-icd
-      rocm-opencl-runtime
-      clinfo
-    ];
-
-    services = {
-      xserver = {
-        desktopManager.gnome.enable = true;
-        displayManager = {
-          gdm.wayland = true;
-          defaultSession = "steam-wayland";
-          autoLogin.enable = true;
-          autoLogin.user = "kabbone";
-        };
-      };
-    };
-
-}

modules/desktop/gnome/home.nix

@@ -1,46 +0,0 @@
-#
-#  Gnome NixOS & Home manager configuration
-#
-#  flake.nix
-#   ├─ ./hosts
-#   │   └─ ./steamdeck
-#   │       └─ home.nix
-#   └─ ./modules
-#       └─ ./desktop
-#           └─ ./gnome
-#               └─ home.nix *
-#
-
-{ config, lib, pkgs, ... }:
-{
-  dconf.settings = {
-    # Enable on-screen keyboard
-    "org/gnome/desktop/a11y/applications" = {
-      screen-keyboard-enabled = true;
-    };
-#    "org/gnome/shell" = {
-#      enabled-extensions = [
-#        "dash-to-dock@micxgx.gmail.com"
-#      ];
-      favorite-apps = ["steam.desktop"];
-    };
-    # Dash to Dock settings for a better touch screen experience
-    "org/gnome/shell/extensions/dash-to-dock" = {
-      background-opacity = 0.80000000000000004;
-      custom-theme-shrink = true;
-      dash-max-icon-size = 48;
-      dock-fixed = true;
-      dock-position = "LEFT";
-      extend-height = true;
-      height-fraction = 0.60999999999999999;
-      hot-keys = false;
-      preferred-monitor = -2;
-      preferred-monitor-by-connector = "eDP-1";
-      scroll-to-focused-application = true;
-      show-apps-at-top = true;
-      show-mounts = true;
-      show-show-apps-button = true;
-      show-trash = false;
-    };
-  };
-}