update system

flake.lock

@@ -9,11 +9,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1717576207,
+        "lastModified": 1721135360,
-        "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=",
+        "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=",
         "owner": "Kirottu",
         "repo": "anyrun",
-        "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4",
+        "rev": "c6101a31a80b51e32e96f6a77616b609770172e0",
         "type": "github"
       },
       "original": {
@@ -45,6 +45,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717312683,
+        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "locked": {
         "lastModified": 1696426674,
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -58,22 +74,6 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719745305,
+        "lastModified": 1719994518,
-        "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
         "type": "github"
       },
       "original": {
@@ -136,7 +136,10 @@
     },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixvim",
@@ -148,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719259945,
+        "lastModified": 1720524665,
-        "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
+        "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
+        "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
         "type": "github"
       },
       "original": {
@@ -190,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827439,
+        "lastModified": 1721534365,
-        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
+        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
+        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
         "type": "github"
       },
       "original": {
@@ -211,11 +214,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719677234,
+        "lastModified": 1720734513,
-        "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
+        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
+        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
         "type": "github"
       },
       "original": {
@@ -252,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719128254,
+        "lastModified": 1720845312,
-        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
+        "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "50581970f37f06a4719001735828519925ef8310",
+        "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
         "type": "github"
       },
       "original": {
@@ -265,6 +268,28 @@
         "type": "github"
       }
     },
+    "nixos-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1721160462,
+        "narHash": "sha256-/VxDWswjySr3CUuMRP4OBBP3sFSps7r1Bh/AJkZSdVk=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "b2d62f3b793495c1156cba6a99512cd95ac2c439",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1716330097,
@@ -281,13 +306,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1719690277,
+        "lastModified": 1720954236,
-        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
+        "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
+        "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1721379653,
+        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
         "type": "github"
       },
       "original": {
@@ -300,7 +341,7 @@
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
@@ -311,11 +352,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1719835160,
+        "lastModified": 1721651056,
-        "narHash": "sha256-AyZJM2la6+CAdKKSC3y80sbneW8dH/2lb+OxKzi2cAw=",
+        "narHash": "sha256-GOm1qWrT0MurD/84RzWj/E6GPmzPT5nH/hrSYohtlxs=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7cc1685eafdcf04cf1058949647ea2c7560f2d65",
+        "rev": "6dc0bda459bcfb2a38cf7b6ed1d6a5d6a8105f00",
         "type": "github"
       },
       "original": {
@@ -326,11 +367,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719837916,
+        "lastModified": 1721666469,
-        "narHash": "sha256-dV1URYa5SezYyz/1IDb1BHmIZ4tM0WtpPfVkFGH8xfY=",
+        "narHash": "sha256-RSdiElnKDUFnHtiWzu5yMyXcyWBFxRjnyOVaObmawYQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0575d7fb334ea662a0a03620780c87df0612eb9a",
+        "rev": "382e7f1785b5366449ccc971c471ebd271274580",
         "type": "github"
       },
       "original": {
@@ -344,6 +385,7 @@
         "anyrun": "anyrun",
         "home-manager": "home-manager",
         "matugen": "matugen",
+        "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim",
         "nur": "nur"
@@ -402,11 +444,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719749022,
+        "lastModified": 1720818892,
-        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
+        "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
+        "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -15,6 +15,10 @@
       url = "github:Kirottu/anyrun";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -25,6 +29,7 @@
       nixvim,
       anyrun,
       matugen,
+      nixos-cosmic,
       ...
     }@inputs:
     let
@@ -48,11 +53,6 @@
               lpc21isp = prev.callPackage ./overlays/lpc21isp { };
               rquickshare = prev.callPackage ./overlays/rquickshare { };
               cura = prev.callPackage ./overlays/cura { };
-              /*
-                kitty = prev.kitty.overrideAttrs (prev: {
-                  patches = prev.patches ++ [ ./kitty.patch ];
-                });
-              */
             })
           ];
         }
@@ -70,6 +70,13 @@
             ./modules/nixos
             ./hosts/${hostname}
             home-manager.nixosModules.home-manager
+            nixos-cosmic.nixosModules.default
+            {
+              nix.settings = {
+                substituters = [ "https://cosmic.cachix.org/" ];
+                trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+              };
+            }
             {
               _module.args = {
                 inherit username;

hosts/MONSTER/default.nix

@@ -48,12 +48,16 @@
     waybar.enable = true;
     dunst.enable = true;
   };
+  services.desktopManager.cosmic.enable = true;
+  services.displayManager.cosmic-greeter.enable = true;
   desktops = {
     hyprland.enable = true;
     # gamescope.enable = true;
   };
   locale.preset.theaninova.enable = true;
 
+  services.xserver.xkb.variant = "altgr-intl";
+  services.xserver.xkb.layout = "us";
   hardware = {
     amdgpu.preset.default.enable = true;
     audio.preset.pipewire.enable = true;

kitty.patch

@@ -1,35 +0,0 @@
-diff --git a/kitty/cell_fragment.glsl b/kitty/cell_fragment.glsl
-index ac310dd1f..dfab7e30a 100644
---- a/kitty/cell_fragment.glsl
-+++ b/kitty/cell_fragment.glsl
-@@ -169,7 +169,7 @@ void main() {
-     vec4 text_fg_premul = calculate_premul_foreground_from_sprites(text_fg);
- #ifdef TRANSPARENT
-     final_color = alpha_blend_premul(text_fg_premul, vec4_premul(background, bg_alpha));
--    final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
-+    // final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
- #else
-     final_color = alpha_blend_premul(text_fg_premul, background);
- #endif
-@@ -197,7 +197,7 @@ void main() {
-     vec4 text_fg_premul = calculate_premul_foreground_from_sprites(text_fg);
-     final_color = text_fg_premul;
- #ifdef TRANSPARENT
--    final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
-+    // final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
- #endif
- #endif
- 
-diff --git a/kitty/shaders.c b/kitty/shaders.c
-index bcda16822..4f38c4388 100644
---- a/kitty/shaders.c
-+++ b/kitty/shaders.c
-@@ -914,7 +914,7 @@ draw_cells_interleaved_premult(ssize_t vao_idx, Screen *screen, OSWindow *os_win
- void
- blank_canvas(float background_opacity, color_type color) {
-     // See https://github.com/glfw/glfw/issues/1538 for why we use pre-multiplied alpha
--#define C(shift) srgb_color((color >> shift) & 0xFF)
-+#define C(shift) srgb_color((color >> shift) & 0xFF) * background_opacity
-     glClearColor(C(16), C(8), C(0), background_opacity);
- #undef C
-     glClear(GL_COLOR_BUFFER_BIT);

modules/home-manager/desktops/hyprland/default.nix

@@ -26,7 +26,8 @@
         ];
         input = {
           accel_profile = "flat";
-          kb_layout = "cc1-thea";
+          kb_layout = osConfig.services.xserver.xkb.layout;
+          kb_variant = osConfig.services.xserver.xkb.variant;
         };
         bind = import ./keybinds.nix;
         bindm = import ./mousebinds.nix;
@@ -140,20 +141,20 @@
       evince
       baobab
       gnome.gvfs
-      gnome.gnome-keyring
+      gnome-keyring
-      gnome.nautilus
+      nautilus
-      gnome.gnome-calendar
+      gnome-calendar
       gnome.gnome-characters
       gnome.gnome-contacts
       gnome.gnome-clocks
-      gnome.gnome-calculator
+      gnome-calculator
-      gnome.simple-scan
+      simple-scan
-      gnome.eog
+      eog
-      gnome.geary
+      geary
-      gnome.ghex
+      ghex
       gnome.gnome-weather
-      gnome.gnome-keyring
+      gnome-keyring
-      gnome.gnome-disk-utility
+      gnome-disk-utility
       # fixes
       xorg.xrandr
     ];

modules/home-manager/packages/default.nix

@@ -13,18 +13,14 @@
 
     # media
     jellyfin-media-player
-    youtube-dl
-    # tartube
     yt-dlp
     f3d
     mpv
     makemkv
     handbrake
     metadata-cleaner
-    #bitwarden
 
     # chat apps
-    threema-desktop
     vesktop
     discord
     element-desktop

modules/home-manager/programs/neovide.nix

@@ -1,15 +1,6 @@
 { pkgs, ... }:
 {
-  home.packages = [
+  home.packages = [ pkgs.neovide ];
-    (pkgs.neovide.overrideAttrs {
-      src = pkgs.fetchFromGitHub {
-        owner = "neovide";
-        repo = "neovide";
-        rev = "1db63d93b18cc1eb5ac5b3e67b3ca63505f10800";
-        hash = "sha256-iBGDxOro1yd98d5XPIw824dapuHDimuP27f/nKbh6qo=";
-      };
-    })
-  ];
   xdg.configFile."neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide" {
     maximized = false;
     fork = true;

modules/home-manager/programs/nixvim/presets/base/completion.nix

@@ -22,7 +22,7 @@ in
               "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
             "<C-p>" = # lua
               "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
-            "<C-Space>" = # lua
+            "<C-.>" = # lua
               "cmp.mapping.confirm({select = true})";
             "<C-Enter>" = # lua
               "cmp.mapping.complete()";

modules/home-manager/theme/hyprland.conf

@@ -1,7 +1,7 @@
 general {
   col.inactive_border = rgba({{colors.surface.default.hex_stripped}}{{custom.transparency_hex | to_lower}})
   col.active_border = rgb({{colors.primary.default.hex_stripped}})
-  border_size = 1
+  border_size = 4
   extend_border_grab_area = 4
   gaps_in = {{custom.padding}}
   gaps_out = {{custom.double_padding}}

modules/home-manager/theme/md3-evo.nix

@@ -176,7 +176,7 @@ in
         runtimeInputs = [
           pkgs.matugen
           pkgs.swww
-          pkgs.gnome.zenity
+          pkgs.zenity
         ];
         text = ''
           WALLPAPER=${config.xdg.configHome}/matugen/wallpaper

modules/nixos/desktops/hyprland.nix

@@ -35,19 +35,21 @@ in
     };
 
     services = {
-      greetd = {
+      /*
-        enable = true;
+        greetd = {
-        settings = {
+          enable = true;
-          initial_session = {
+          settings = {
-            command = "${pkgs.hyprland}/bin/Hyprland &> /dev/null";
+            initial_session = {
-            user = username;
+              command = "${pkgs.hyprland}/bin/Hyprland &> /dev/null";
-          };
+              user = username;
-          default_session = {
+            };
-            command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks";
+            default_session = {
-            user = username;
+              command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks";
+              user = username;
+            };
           };
         };
-      };
+      */
 
       dbus.enable = true;
 

modules/nixos/hardware/cc1.nix

@@ -23,7 +23,7 @@ in
     # TODO: per-device layout?
     console.useXkbConfig = true;
     services.xserver.xkb = {
-      layout = cfg.layout;
+      layout = lib.mkDefault cfg.layout;
       extraLayouts.cc1-thea = {
         description = "A CC1 optimized layout";
         languages = [

modules/nixos/hardware/fv43u.nix

@@ -23,7 +23,6 @@ in
       general.layout = "master";
       master = {
         orientation = "center";
-        new_is_master = true;
         always_center_master = true;
         mfact = 0.4;
       };

modules/nixos/hardware/q3279vwf.nix

@@ -22,7 +22,6 @@ in
       general.layout = "master";
       master = {
         orientation = "center";
-        new_is_master = true;
         always_center_master = true;
         mfact = 0.4;
       };