updating for reinstall of kaladin

home/home.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ags, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   laptop = builtins.readFile "/etc/hostname" == "syl\n";
@@ -6,7 +6,7 @@ in
 {
   imports = [
     ./modules/hyprland.nix
-    ags.homeManagerModules.default
+    #ags.homeManagerModules.default
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
@@ -665,14 +665,14 @@ tooltip label {
     source = ../.config/fish/functions;
   };
 
-  programs.ags = {
-    enable = true;
-    extraPackages = with pkgs; [
-      gtksourceview
-      webkitgtk
-      accountsservice
-    ];
-  };
+ #programs.ags = {
+ #  enable = true;
+ #  extraPackages = with pkgs; [
+ #    gtksourceview
+ #    webkitgtk
+ #    accountsservice
+ #  ];
+ #};
 
   programs.fish = {
     enable = true;
@@ -874,7 +874,6 @@ end
 
   programs.nushell = {
     enable = true;
-    # package = pkgs.nushellFull;
     shellAliases = {
       # ls = "eza -l";
       la = "ls -la";
@@ -1130,7 +1129,7 @@ end
 
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     autocd = true;

home/modules/hyprland.nix

@@ -81,11 +81,8 @@ in
     '';
   };
   home.file.".config/hypr/hyprpaper.conf" = {
-    source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprpaper.conf else /home/chris/.dotfiles/.config/hypr/hyprpaper.conf;
+    source = if laptop then /root/dotfiles/.config/hypr/hyprpaper.conf else /root/dotfiles/.config/hypr/hyprpaper.conf;
   };
-  # home.file.".config/hypr/hyprsome" = {
-  #   source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprsome else /home/chris/.dotfiles/.config/hypr/hyprsome;
-  # };
 
   wayland.windowManager.hyprland = {
     enable = true;

modules/desktop.nix

@@ -35,25 +35,8 @@ with lib;
       enable = true;
       package = pkgs.awesome;
     };
-    displayManager = {
-      startx.enable = true;
-      sddm = {
-        enable = false;
-      };
-      gdm.enable = false;
-      session = [
-        {
-          manage = "desktop";
-          name = "Hyprland";
-          start = ''
-          /home/chris/bin/hyprland &
-          waitPID=$!
-        '';
-        }
-      ];
-    };
     desktopManager.plasma5 = {
-      enable = true;
+      enable = false;
       runUsingSystemd = true;
     };
     # desktopManager.gnome.enable = true;
@@ -201,7 +184,7 @@ with lib;
   services.flatpak.enable = true;
 
   # Configure keymap in X11
-  services.xserver.layout = "us";
+  services.xserver.xkb.layout = "us";
   # services.xserver.xkbOptions = "eurosign:e";
 
   # Enable CUPS to print documents.

pkgs/base-packages.nix

@@ -30,7 +30,7 @@
     binutils
     podman-compose
     eza
-    nushellFull
+    nushell
     iperf
     # img2pdf
     yt-dlp

pkgs/desktop-packages.nix

@@ -43,7 +43,7 @@ with lib;
     sassc
     # pantalaimon
     plasma5Packages.kwallet
-    sierra-breeze-enhanced
+    # sierra-breeze-enhanced
     libimobiledevice
     # textgen-amd
     # bottles
@@ -54,13 +54,13 @@ with lib;
     # python310Packages.mutagen
     python310Packages.audiotools
     (mpv.override {scripts = with pkgs.mpvScripts; [ mpris quality-menu sponsorblock ];})
-    haruna
+    # haruna
     ani-cli
     # mov-cli
     nerdfonts
     plasma-browser-integration
     alacritty
-    libsForQt5.bismuth
+    # libsForQt5.bismuth
     libnotify
     rofi-wayland
     #anyrun
@@ -96,21 +96,21 @@ with lib;
     kde-cli-tools
     gzip 
     qrencode
-    brave
-    scribus
-    darktable
+    # brave
+    # scribus
+    # darktable
     # qutebrowser
     virt-manager
     virt-viewer
     # firefox
-    kate
+    # kate
     kdialog
     plasma5Packages.khotkeys
     # openlp
     inkscape
     libreoffice-fresh
     vlc
-    neochat
+    # neochat
     haskellPackages.greenclip
     pulsemixer
     any-nix-shell
@@ -137,22 +137,22 @@ with lib;
     # glaxnimate
     mediainfo
     libmediainfo
-    minetest
+    # minetest
     pqiv
     plasma5Packages.audiotube
     # natron
-    digikam
+    # digikam
     rubberband
-    texliveFull
+    #texlive
     wlroots
     # picom-jonaburg
     pamixer
     playerctl
     jellyfin-mpv-shim
-    pfetch
+    # pfetch
     macchina
     gimp
-    krita
+    # krita
     powertop
     element-desktop-wayland
     scrcpy

systems/kaladin/hardware-configuration.nix

@@ -11,17 +11,24 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10";
+    { device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba";
       fsType = "btrfs";
       options = [ "subvol=@" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10";
+    { device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba";
       fsType = "btrfs";
       options = [ "subvol=@home" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
     };
 
+  fileSystems."/snapshots" =
+    { device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba";
+      fsType = "btrfs";
+      options = [ "subvol=snapshots" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
+    };
+
+
  #fileSystems."/nix" =
  #  { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10";
  #    fsType = "btrfs";
@@ -48,6 +55,7 @@
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/35A0-C1F1";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices = [ ];
@@ -60,6 +68,6 @@
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
 
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }