Merge branch 'main' of cgit:/srv/git/NixOS-config

6 files changed, 69 insertions, 2 deletions

diff --git a/flake.nix b/flake.nix
index a908605..f44ea41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,7 +103,7 @@
   in {
     nixosConfigurations = {
       kronos = mkSystem "kronos" "schrottkatze";
-      herra = mkSystem "herra" "schrottkatze";
+      herra = mkSystem "herra" "cinnamon";
       mystra = mkSystem "mystra" "nord-blue";
     };
   };
diff --git a/home/rices/cinnamon/default.nix b/home/rices/cinnamon/default.nix
new file mode 100644
index 0000000..6b7865d
--- /dev/null
+++ b/home/rices/cinnamon/default.nix
@@ -0,0 +1,4 @@
+{
+  system = import ./system.nix;
+  home = import ./home.nix;
+}
diff --git a/home/rices/cinnamon/home.nix b/home/rices/cinnamon/home.nix
new file mode 100644
index 0000000..5e994b3
--- /dev/null
+++ b/home/rices/cinnamon/home.nix
@@ -0,0 +1,3 @@
+{...}: {
+  # Cinnamon manages most UI config itself; HM overrides can go here
+}
diff --git a/home/rices/cinnamon/system.nix b/home/rices/cinnamon/system.nix
new file mode 100644
index 0000000..5800da1
--- /dev/null
+++ b/home/rices/cinnamon/system.nix
@@ -0,0 +1,57 @@
+{pkgs, ...}: let
+  vars = import ./variables.nix;
+in {
+  services.xserver = {
+    enable = true;
+    desktopManager.cinnamon.enable = true;
+    xkb = {
+      layout = "cz";
+      options = "eurosign:e,caps:escape";
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    xorg.xrandr
+    xclip
+  ];
+
+  stylix = {
+    enable = true;
+    autoEnable = true;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
+    image = vars.image;
+
+    fonts = {
+      monospace = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans Mono";
+      };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-color-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        terminal = 11;
+        applications = 11;
+        desktop = 11;
+      };
+    };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Classic";
+      size = 24;
+    };
+
+    polarity = "dark";
+    targets.nixos-icons.enable = false;
+  };
+}
diff --git a/home/rices/cinnamon/variables.nix b/home/rices/cinnamon/variables.nix
new file mode 100644
index 0000000..4c13af7
--- /dev/null
+++ b/home/rices/cinnamon/variables.nix
@@ -0,0 +1,3 @@
+{
+  image = ../../../assets/wallpapers/insert_coin.jpeg;
+}
diff --git a/hosts/herra/file-system.nix b/hosts/herra/file-system.nix
index 2e47cf2..42976ff 100644
--- a/hosts/herra/file-system.nix
+++ b/hosts/herra/file-system.nix
@@ -1,6 +1,6 @@
 {...}: {
   fileSystems."/nix" = {
-    options = [ "subvol=@nix" "compress=zstd:3" "noatime" ];
+    options = [ "compress=zstd:3" "noatime" ];
     neededForBoot = true;
   };
 }