nixos/configuration.nix

@@ -13,9 +13,29 @@ in
       (import "${home-manager}/nixos")
     ];
 
-  fileSystems."/".options = [ "compress=zstd" ];
-  fileSystems."/home".options = [ "compress=zstd" ];
-  fileSystems."/nix".options = [ "compress=zstd" "noatime" ];
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/d488d0d7-c1df-49b7-b713-2f6397bd86fb";
+      fsType = "btrfs";
+      options = [ "compress=zstd" "subvol=nixroot" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/d488d0d7-c1df-49b7-b713-2f6397bd86fb";
+      fsType = "btrfs";
+      options = [ "compress=zstd" "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/d488d0d7-c1df-49b7-b713-2f6397bd86fb";
+      fsType = "btrfs";
+      options = [ "compress=zstd" "noatime" "subvol=nix" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B0E9-D206";
+      fsType = "vfat";
+    };
+
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -83,12 +103,12 @@ in
     #media-session.enable = true;
   };
 
-  # Define a user account. Don't forget to set a password with 'passwd'.
+  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.daan = {
     isNormalUser = true;
     description = "Daan Vanoverloop";
     extraGroups = [ "networkmanager" "wheel" ];
-    # shell = pkgs.zsh;
+    shell = pkgs.zsh;
   };
 
   home-manager.users.daan = { pkgs, ... }: {
@@ -97,24 +117,8 @@ in
 
     home.stateVersion = "23.05";
 
-    imports = [ ./dconf.nix ./gnome.nix ];
-
-    home.sessionVariables = { GTK_THEME = "Adwaita:dark"; }; 
-
     programs.home-manager.enable = true;
 
-    programs.helix = {
-      enable = true;
-      settings = {
-        theme = "onedark";
-        editor = {
-          line-number = "relative";
-          cursor-shape.insert = "bar";
-          soft-wrap.enable = true;
-        };
-      };
-    };
-
     programs.zsh = {
       enable = true;
       shellAliases = {
@@ -125,7 +129,6 @@ in
         EDITOR = "hx";
         TERM = "xterm-256color";
         COLORTERM = "truecolor";
-        NIX_BUILD_SHELL = "zsh";
       };
       oh-my-zsh = {
         enable = true;
@@ -139,19 +142,13 @@ in
 
     home.packages = with pkgs; [
       nil
-      jellyfin-media-player
     ];
   };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.gnomeExtensions.gsconnect;
-  };
-
-  # programs.zsh.enable = true;
+  programs.zsh.enable = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -163,10 +160,6 @@ in
     openssh
   ];
 
-  hardware.opengl.extraPackages = with pkgs; [
-    intel-media-driver
-  ];
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;

nixos/dconf.nix

@@ -1,66 +0,0 @@
-# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
-{ lib, ... }:
-
-with lib.hm.gvariant;
-
-{
-  dconf.settings = {
-    "org/gnome/desktop/input-sources" = {
-      sources = [ (mkTuple [ "xkb" "us" ]) ];
-      xkb-options = [ "eurosign:e" "caps:escape" ];
-    };
-
-    "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
-    };
-
-    "org/gnome/desktop/peripherals/touchpad" = {
-      tap-to-click = true;
-      two-finger-scrolling-enabled = true;
-    };
-
-    "org/gnome/desktop/wm/keybindings" = {
-      close = [ "<Shift><Super>q" ];
-      move-to-workspace-1 = [ "<Shift><Super>1" ];
-      move-to-workspace-2 = [ "<Shift><Super>2" ];
-      move-to-workspace-3 = [ "<Shift><Super>3" ];
-      move-to-workspace-4 = [ "<Shift><Super>4" ];
-      move-to-workspace-5 = [ "<Shift><Super>5" ];
-      move-to-workspace-6 = [ "<Shift><Super>6" ];
-      move-to-workspace-7 = [ "<Shift><Super>7" ];
-      move-to-workspace-8 = [ "<Shift><Super>8" ];
-      move-to-workspace-9 = [ "<Shift><Super>9" ];
-      switch-to-workspace-1 = [ "<Super>1" ];
-      switch-to-workspace-2 = [ "<Super>2" ];
-      switch-to-workspace-3 = [ "<Super>3" ];
-      switch-to-workspace-4 = [ "<Super>4" ];
-      switch-to-workspace-5 = [ "<Super>5" ];
-      switch-to-workspace-6 = [ "<Super>6" ];
-      switch-to-workspace-7 = [ "<Super>7" ];
-      switch-to-workspace-8 = [ "<Super>8" ];
-      switch-to-workspace-9 = [ "<Super>9" ];
-    };
-
-    "org/gnome/settings-daemon/plugins/media-keys" = {
-      custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" ];
-    };
-
-    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-      binding = "<Super>Return";
-      command = "kgx";
-      name = "Terminal";
-    };
-
-    "org/gnome/shell/keybindings" = {
-      switch-to-application-1 = [ "" ];
-      switch-to-application-2 = [ "" ];
-      switch-to-application-3 = [ "" ];
-      switch-to-application-4 = [ "" ];
-      switch-to-application-5 = [ "" ];
-      switch-to-application-6 = [ "" ];
-      switch-to-application-7 = [ "" ];
-      switch-to-application-8 = [ "" ];
-      switch-to-application-9 = [ "" ];
-    };
-  };
-}

nixos/gnome.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }: 
-rec {
-  home.packages = with pkgs.gnomeExtensions; [
-    gsconnect
-    vitals
-    caffeine
-  ];
-
-  dconf.settings = {
-    # Enable installed extensions
-    "org/gnome/shell".enabled-extensions = map (extension: extension.extensionUuid) home.packages;
-
-    "org/gnome/shell".disabled-extensions = [];
-  };
-}