update

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "catppuccin": {
       "locked": {
-        "lastModified": 1716337435,
+        "lastModified": 1717565621,
-        "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=",
+        "narHash": "sha256-uU6GeSbzopVcPga+Fy5n3tKfzUhuw4FVMv7h61/13XY=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82",
+        "rev": "0cdfa29b902976fc2941468d326325d24e148437",
         "type": "github"
       },
       "original": {
@@ -275,15 +275,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1716457508,
+        "lastModified": 1717527182,
-        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -317,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716214890,
+        "lastModified": 1717449440,
-        "narHash": "sha256-/zk5wn2NC8yOZLd6IxpmiVnnSj8mZUznDTngXvNM/vU=",
+        "narHash": "sha256-QtSCQFBhyQIsKJhOvcIOi+9EN1kEnNeoLo3PeQ5VbIY=",
         "owner": "StevenBlack",
         "repo": "hosts",
-        "rev": "7dc5651e1edcc5268fd72dfb90bd1c5c9fba942d",
+        "rev": "e1a7b23e9769607009d741066b5789a99aaf9923",
         "type": "github"
       },
       "original": {
@@ -341,11 +342,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1716374315,
+        "lastModified": 1716893760,
-        "narHash": "sha256-tgSiLFT0PRGKbypXPCcBCqDRPXXGOkfTpRm1IEiyFyM=",
+        "narHash": "sha256-fI3Q8DpkSerjQ37pXBW9ZHKDQQVYfG5stDMw7n9No10=",
         "owner": "ivandimitrov8080",
         "repo": "flake-ide",
-        "rev": "41c6c4d63e0cb294ab19d0fd46fdb0d4c9c4d2a9",
+        "rev": "eb5e62023fcf8ccab169a313a66ccdc7ff8a3319",
         "type": "github"
       },
       "original": {
@@ -411,11 +412,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716170277,
+        "lastModified": 1717297675,
-        "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
+        "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
+        "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9",
         "type": "github"
       },
       "original": {
@@ -448,16 +449,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716358718,
+        "lastModified": 1717281328,
-        "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=",
+        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3f316d2a50699a78afe5e77ca486ad553169061e",
+        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,8 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hosts = {
@@ -22,6 +22,7 @@
   outputs = { nixpkgs, home-manager, hosts, ide, nid, catppuccin, ... }:
     let
       system = "x86_64-linux";
+      stateVersion = "24.05";
       my-overlay = self: super: {
         scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; });
       };
@@ -33,10 +34,10 @@
         inherit system nixpkgs pkgs ide my-overlay;
       };
       home = import ./home {
-        inherit pkgs modules home-manager nid catppuccin;
+        inherit stateVersion pkgs modules home-manager nid catppuccin;
       };
       nixos = import ./nixos {
-        inherit system nixpkgs modules hosts catppuccin;
+        inherit stateVersion system nixpkgs modules hosts catppuccin;
       };
     in
     {

home/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, modules, nid, catppuccin, ... }:
+{ stateVersion, pkgs, home-manager, modules, nid, catppuccin, ... }:
 let
   ivand-programs = with modules.home.programs; [
     bat
@@ -36,6 +36,6 @@ in
 {
   ivand = home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = [ ./ivand nid.hmModules.nix-index ivand-packages ] ++ ivand-programs ++ [ catppuccin.homeManagerModules.catppuccin ];
+    modules = [{ home.stateVersion = stateVersion; } ./ivand nid.hmModules.nix-index ivand-packages] ++ ivand-programs ++ [ catppuccin.homeManagerModules.catppuccin ];
   };
 }

home/ivand/default.nix

@@ -13,13 +13,18 @@
     catppuccin.enable = true;
   };
 
-  home = {
+  home = rec {
     username = "ivand";
     homeDirectory = "/home/ivand";
-    stateVersion = "23.11";
     sessionPath = [
       "$HOME/.local/bin"
     ];
+    sessionVariables = {
+      PASSWORD_STORE_DIR = "${homeDirectory}/.password-store";
+      EDITOR = "nvim";
+      PAGER = "bat";
+      TERM = "screen-256color";
+    };
     pointerCursor = {
       name = "Catppuccin-Mocha-Green-Cursors";
       package = pkgs.catppuccin-cursors.mochaGreen;

modules/home/programs/nushell/default.nix

@@ -12,10 +12,7 @@
           }
         }
       '';
-      PASSWORD_STORE_DIR = "($env.HOME | path join .password-store)";
       PATH = "($env.PATH | split row (char esep) | append ($env.HOME | path join .local bin))";
-      EDITOR = "nvim";
-      TERM = "screen-256color";
     };
     shellAliases = {
       gcal = ''

modules/home/programs/zsh/default.nix

@@ -7,11 +7,6 @@
     loginExtra = ''
       [ "$(tty)" = "/dev/tty1" ] && exec sway
     '';
-    sessionVariables = {
-      PASSWORD_STORE_DIR = "$HOME/.password-store";
-      PAGER = "bat";
-      TERM = "screen-256color";
-    };
     shellAliases = {
       cal = "cal $(date +%Y)";
       GG = "git add . && git commit -m 'GG' && git push --set-upstream origin HEAD";
@@ -21,9 +16,11 @@
       ga = "git add .";
       gc = "git commit";
       dev = "nix develop --command $SHELL";
-      la = "ls -alh";
+      ls = "${pkgs.nushell}/bin/nu -c 'ls'";
+      la = "${pkgs.nushell}/bin/nu -c 'ls -al'";
       torrent = "transmission-remote";
       vi = "nvim";
+      sc = "systemctl";
     };
     shellGlobalAliases = {
       comp = "-vcodec libx265 -crf 28";

modules/nixos/dnscrypt/default.nix

@@ -1,26 +0,0 @@
-{
-  networking = {
-    nameservers = [ "127.0.0.1" "::1" ];
-    dhcpcd.extraConfig = "nohook resolv.conf";
-  };
-
-  services.dnscrypt-proxy2 = {
-    enable = true;
-    settings = {
-      ipv6_servers = true;
-      require_dnssec = true;
-      sources.public-resolvers = {
-        urls = [
-          "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
-          "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
-        ];
-        cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
-        minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
-      };
-    };
-  };
-  systemd.services.dnscrypt-proxy2.serviceConfig = {
-    StateDirectory = "dnscrypt-proxy";
-  };
-}
-

modules/nixos/gaming/default.nix

@@ -1,19 +0,0 @@
-{ nixpkgs, ... }:
-{
-  imports = [ ../nvidia ];
-  # Uses unfree shit
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (nixpkgs.lib.getName pkg) [
-      "steam"
-      "steamcmd"
-      "steam-original"
-      "steam-run"
-      "nvidia-settings"
-      "nvidia-x11"
-      "nvidia-persistenced"
-    ];
-  programs.steam = {
-    enable = true;
-  };
-}
-

modules/nixos/nvidia/default.nix

@@ -1,22 +0,0 @@
-{ nixpkgs, ... }:
-{
-  # Uses unfree shit
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (nixpkgs.lib.getName pkg) [
-      "nvidia-settings"
-      "nvidia-x11"
-      "nvidia-persistenced"
-    ];
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-  hardware.nvidia = {
-    prime = {
-      sync.enable = true;
-      nvidiaBusId = "PCI:1:0:0";
-      intelBusId = "PCI:0:2:0";
-    };
-    modesetting.enable = true;
-    nvidiaSettings = true;
-  };
-}
-

nixos/default.nix

@@ -1,13 +1,11 @@
-{ system, nixpkgs, modules, hosts, catppuccin, ... }: {
+{ stateVersion, system, nixpkgs, modules, hosts, catppuccin, ... }: {
   laptop = nixpkgs.lib.nixosSystem {
     inherit system;
-    modules = with modules.nixos; [
+    modules = [
+      { system.stateVersion = stateVersion; }
       ../hardware-configuration.nix
       ./laptop
-      # dnscrypt
+      modules.nixos.wireguard
-      # gaming
-      wireguard
-      # nvidia
       hosts.nixosModule
       catppuccin.nixosModules.catppuccin
     ];

nixos/laptop/default.nix

@@ -1,7 +1,5 @@
 { config, pkgs, ... }: {
 
-  system.stateVersion = "23.11";
-
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes
@@ -71,7 +69,7 @@
 
   i18n.supportedLocales = [ "all" ];
 
-  time.timeZone = "Europe/Sofia";
+  time.timeZone = "Europe/Prague";
 
   fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) noto-fonts noto-fonts-emoji noto-fonts-lgc-plus ];
 
@@ -118,6 +116,15 @@
         "BOUTIQUE APARTMENTS" = {
           psk = "boutique26";
         };
+        "Safestay" = {
+          psk = "AlldayrooftopBAR";
+        };
+        "HOSTEL JASMIN 2" = {
+          psk = "Jasmin2024";
+        };
+        "HOME" = {
+          psk = "iloveprague";
+        };
       };
     };
     stevenBlackHosts = {
@@ -138,7 +145,6 @@
     defaultUserShell = pkgs.zsh;
     users = {
       ivand = {
-        shell = pkgs.nushell;
         isNormalUser = true;
         extraGroups = [
           "adbusers"