diff --git a/flake.lock b/flake.lock index b5c6dba..661433e 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1785119570, - "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", + "lastModified": 1789267039, + "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", + "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1786528975, - "narHash": "sha256-8KuasCs+mVQ7WbLONUf/QB7NZeQvovyXRyxAj4nOOzY=", + "lastModified": 1789417814, + "narHash": "sha256-xV9fcqtH6jJLVBF3ocqBBwZkPKEke+BujhEwT4Ye9Tc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e7edd9afe17e45521300e041c65de3015f4a302", + "rev": "d40fd26f323c898b0c195d41aa5efadd85f57832", "type": "github" }, "original": { @@ -123,11 +123,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1786599213, - "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1786535285, - "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", + "lastModified": 1789344334, + "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5", + "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", "type": "github" }, "original": { diff --git a/home/cads.nix b/home/cads.nix index f928854..ef71668 100644 --- a/home/cads.nix +++ b/home/cads.nix @@ -3,7 +3,8 @@ home.packages = (with pkgs; [ openscad kicad - kicadAddons.kikit + kicadAddons.kikit-library + kikit freecad librecad ]); diff --git a/home/i3.nix b/home/i3.nix index 0f183a4..a4d4b91 100644 --- a/home/i3.nix +++ b/home/i3.nix @@ -53,7 +53,7 @@ in "${modKey}+y" = "split h"; "${modKey}+t" = "split v"; "${modKey}+f" = "fullscreen toggle"; - "${modKey}+s" = "layout stacking"; + "${modKey}+s" = "sticky toggle"; "${modKey}+w" = "layout tabbed"; "${modKey}+e" = "layout toggle split"; "${modKey}+Shift+space" = "floating toggle"; @@ -86,6 +86,8 @@ in "${modKey}+Shift+8" = ''move container to workspace number "8"''; "${modKey}+Shift+9" = ''move container to workspace number "9"''; "${modKey}+Shift+0" = ''move container to workspace number "10"''; + "${modKey}+Shift+p" = ''move container to workspace prev''; + "${modKey}+Shift+n" = ''move container to workspace next''; "XF86AudioRaiseVolume" = ''exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%''; "XF86AudioLowerVolume" = ''exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%''; "XF86AudioMute" = ''exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle''; diff --git a/hosts/waku/default.nix b/hosts/waku/default.nix index 39185c1..be88cbb 100644 --- a/hosts/waku/default.nix +++ b/hosts/waku/default.nix @@ -10,6 +10,7 @@ boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_latest; boot.tmp.cleanOnBoot = true; + boot.resumeDevice = "/dev/nvme0n1p2"; boot.binfmt.preferStaticEmulators = true; boot.binfmt.emulatedSystems = [ "aarch64-linux" @@ -84,7 +85,6 @@ environment.systemPackages = (with pkgs; [ amdgpu_top - arduino-ide kdePackages.xdg-desktop-portal-kde my-ricing-assets opencode @@ -101,7 +101,7 @@ xdg-desktop-portal-gtk xdg-desktop-portal-xapp xournalpp - ]); + ]) ++ [ pkgs.unstable.arduino-ide ]; environment.variables = { MY_RICING_ASSETS_PATH = "${pkgs.my-ricing-assets}/"; diff --git a/profiles/base.nix b/profiles/base.nix index cd16784..0bc149b 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -7,7 +7,7 @@ networking.wireless.iwd = { enable = true; - package = pkgs.unstable.iwd; + package = pkgs.iwd; }; networking.networkmanager = { enable = lib.mkDefault true;