Merge branch 'master' of ssh://bosco:/srv/git/.flake

7 files changed, 23 insertions, 19 deletions

diff --git a/flake.lock b/flake.lock
index 6f9f899..330e7d1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -242,11 +242,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1725563063,
-        "narHash": "sha256-jA5U0yT+fXyRijo2ErvR//Jyb4IyidDOhII5Vom0T2c=",
+        "lastModified": 1725580992,
+        "narHash": "sha256-DM6yo18MJnI72KEfRCDjue+JMiJWJNMbUr4YJ7/BJro=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "727f1b54cd1ba48774092a5d54acc0e55f3ffe0f",
+        "rev": "b0fca6eaf00a2c5061f499c76ec8d60772b6a719",
         "type": "github"
       },
       "original": {
@@ -364,15 +364,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1718419213,
-        "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=",
-        "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1",
+        "lastModified": 1723503926,
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
     "lix-module": {
@@ -385,15 +385,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1718778548,
-        "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=",
-        "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9",
+        "lastModified": 1723510904,
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
       }
     },
     "nix-colors": {
diff --git a/flake.nix b/flake.nix
index 6b8eb1a..d906fcd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
 
     # alternative nix compiler
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 5493730..bea666d 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -77,7 +77,8 @@
         easyeffects
         mpv
         lutris
-        wine
+        # wine
+        wineWowPackages.waylandFull
         # unstable.yt-dlp
         yt-dlp
         telegram-desktop
@@ -110,7 +111,7 @@
         putty
         qbittorrent
         # mpris
-        ciscoPacketTracer8
+        # ciscoPacketTracer8
         # ciscoPacketTracer7
         openjdk
         adoptopenjdk-icedtea-web
diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index 08b84c9..5da9614 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -100,7 +100,9 @@
   };
 
   # environment.systemPackages = with pkgs; [
-  #   docker
+  #   # wineWowPackages.waylandFull
+  #   # wine
+  #   # docker
   # ];
   virtualisation.docker = {
     enable = true;
diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix
index eafc03c..d74bb93 100644
--- a/modules/home-manager/starship.nix
+++ b/modules/home-manager/starship.nix
@@ -6,6 +6,6 @@
       command_timeout = 1000;
 
       palette = "catppuccin_mocha";
-    } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml");
+    } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/themes/mocha.toml");
   };
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index a6d62e3..9694e20 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,6 +6,6 @@
   nix-common = import ./nix-common.nix;
   services = import ./services.nix;
   steam = import ./steam.nix;
-  sway = import ./sway.nix;
+  # sway = import ./sway.nix;
   system-packages = import ./system-packages.nix;
 }
diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix
index 99c7a6d..b8f1cc7 100644
--- a/modules/nixos/system-packages.nix
+++ b/modules/nixos/system-packages.nix
@@ -9,6 +9,7 @@
     wget
     unzip
     git
+    wireguard-tools
     wl-clipboard
     pciutils
     usbutils