From 2df72c619b7f7d3a83fd4514ffa6de9ba7595493 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Thu, 18 Sep 2025 09:21:19 +0200 Subject: [PATCH] update to unstable --- .config/carapace/init.nu | 7 ++-- .config/hypr/hyprland.conf | 18 +++++---- .config/nushell/git-completions.nu | 12 +++--- configuration.nix | 32 ++------------- flake.lock | 63 +++++++++++++++--------------- flake.nix | 6 ++- home.nix | 22 ++++++++--- powersave.nix | 1 - remove-old-nix.sh | 2 +- 9 files changed, 76 insertions(+), 87 deletions(-) diff --git a/.config/carapace/init.nu b/.config/carapace/init.nu index 7368355..21b02d8 100644 --- a/.config/carapace/init.nu +++ b/.config/carapace/init.nu @@ -6,14 +6,14 @@ def --env unset-env [name] { hide-env $name } let carapace_completer = {|spans| # if the current command is an alias, get it's expansion - let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion) + let expanded_alias = (scope aliases | where name == $spans.0 | $in.0?.expansion?) # overwrite let spans = (if $expanded_alias != null { # put the first word of the expanded alias first in the span $spans | skip 1 | prepend ($expanded_alias | split row " " | take 1) } else { - $spans + $spans | skip 1 | prepend ($spans.0) }) carapace $spans.0 nushell ...$spans @@ -24,7 +24,8 @@ mut current = (($env | default {} config).config | default {} completions) $current.completions = ($current.completions | default {} external) $current.completions.external = ($current.completions.external | default true enable -| default $carapace_completer completer) +# backwards compatible workaround for default, see nushell #15654 +| upsert completer { if $in == null { $carapace_completer } else { $in } }) $env.config = $current diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index c4d81d4..2c91046 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -22,9 +22,9 @@ cursor { no_hardware_cursors = true } -render { - explicit_sync = false -} +#render { + #explicit_sync = false +#} source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/workspaces.conf @@ -232,10 +232,13 @@ master { #new_is_master = false } -gestures { +#gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = true -} +# workspace_swipe = true +#} +gesture = 3, horizontal, workspace +gesture = 3, up, fullscreen +gesture = 3, down, fullscreen, maximize # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more @@ -302,7 +305,8 @@ bind = $mainMod, T, exec, kitty bind=$mainMod,K,exec,kitty bind=SUPER,B,exec,vivaldi-stable bind = super+ctrl, q, exit, -bind = $mainMod, E, exec, dolphin +bind = $mainMod, E, exec, cosmic-files +bind = $mainMod+SHIFT, E, exec, dolphin #! current window management bind = $mainMod, Q, killactive, # bind = $mainMod, V, togglefloating, diff --git a/.config/nushell/git-completions.nu b/.config/nushell/git-completions.nu index 4aad523..a835a4d 100644 --- a/.config/nushell/git-completions.nu +++ b/.config/nushell/git-completions.nu @@ -82,7 +82,7 @@ module git-completion-utils { } export def get-all-git-branches []: nothing -> list { - ^git branch -a --format '%(refname:lstrip=2)%09%(upstream:lstrip=2)' | lines | str trim | filter { not ($in ends-with 'HEAD' ) } + ^git branch -a --format '%(refname:lstrip=2)%09%(upstream:lstrip=2)' | lines | str trim | where { not ($in ends-with 'HEAD' ) } } # Extract remote branches which do not have local counterpart @@ -103,9 +103,9 @@ module git-completion-utils { # and we pick ['feature/awesome-2', 'awesome-3'] let lines = $in let long_current = if ($current | is-empty) { '' } else { $'origin/($current)' } - let branches = $lines | filter { ($in != $long_current) and not ($in starts-with $"($current)\t") } + let branches = $lines | where { ($in != $long_current) and not ($in starts-with $"($current)\t") } let tracked_remotes = $branches | find "\t" | each { split row "\t" -n 2 | get 1 } - let floating_remotes = $lines | filter { "\t" not-in $in and $in not-in $tracked_remotes } + let floating_remotes = $lines | where { "\t" not-in $in and $in not-in $tracked_remotes } $floating_remotes | each { let v = $in | split row -n 2 '/' | get 1 if $v == $current { null } else $v @@ -115,10 +115,10 @@ module git-completion-utils { export def extract-mergable-sources [current: string]: list -> list> { let lines = $in let long_current = if ($current | is-empty) { '' } else { $'origin/($current)' } - let branches = $lines | filter { ($in != $long_current) and not ($in starts-with $"($current)\t") } + let branches = $lines | where { ($in != $long_current) and not ($in starts-with $"($current)\t") } let git_table: list> = $branches | each {|v| if "\t" in $v { $v | split row "\t" -n 2 | {n: $in.0, u: $in.1 } } else {n: $v, u: null } } let siblings = $git_table | where u == null and n starts-with 'origin/' | get n | str substring 7.. - let remote_branches = $git_table | filter {|r| $r.u == null and not ($r.n starts-with 'origin/') } | get n + let remote_branches = $git_table | where {|r| $r.u == null and not ($r.n starts-with 'origin/') } | get n [...($siblings | wrap value | insert description Local), ...($remote_branches | wrap value | insert description Remote)] } @@ -171,7 +171,7 @@ def "nu-complete git mergable sources" [] { def "nu-complete git switch" [] { use git-completion-utils * let current = (^git branch --show-current) # Can be empty if in detached HEAD - let local_branches = ^git branch --format '%(refname:short)' | lines | filter { $in != $current } | wrap value | insert description 'Local branch' + let local_branches = ^git branch --format '%(refname:short)' | lines | where { $in != $current } | wrap value | insert description 'Local branch' let remote_branches = (get-all-git-branches | extract-remote-branches-nonlocal-short $current) | wrap value | insert description 'Remote branch' [...$local_branches, ...$remote_branches] } diff --git a/configuration.nix b/configuration.nix index 4ff9e9c..26ce872 100644 --- a/configuration.nix +++ b/configuration.nix @@ -28,6 +28,7 @@ in "olm-3.2.16" "cinny-unwrapped-4.2.3" "cinny-4.2.3" + "libsoup-2.74.3" # "qbittorrent-4.6.4" # "cinny-3.2.0" "dotnet-sdk-wrapped-7.0.410" @@ -429,35 +430,8 @@ in ]; # Or disable the firewall altogether. networking.firewall.enable = false; - - services.udev.extraRules = '' - # Wooting One Legacy - - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" - - SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" - - # Wooting One update mode - - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess" - - # Wooting Two Legacy - - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" - - SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" - - # Wooting Two update mode - - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess" - - # Generic Wootings - - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess" - - SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" - ''; - + hardware.wooting.enable = true; + services.syncthing = { enable = true; openDefaultPorts = true; diff --git a/flake.lock b/flake.lock index 6a3244a..eafd071 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1757318914, - "narHash": "sha256-YFPa/eXYUA6ZtgTqGij4XVKbfA9S1UA8UEYSTgkob5c=", + "lastModified": 1758061721, + "narHash": "sha256-+agPUV+fOJSpqjVOEM0xC8+xhBFbnQesyy+8ErwGpks=", "owner": "9001", "repo": "copyparty", - "rev": "25749b4b5fccfd3f0fc226fb46d574ffd55d1ee8", + "rev": "5996a58b20fa015bd404dfdb2cef8892909b3d69", "type": "github" }, "original": { @@ -206,16 +206,15 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1758160734, + "narHash": "sha256-4YoMTUZRXb2XggJi11lSJnehrwM6u31Ylu2cOzb96JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "a504aee7d452ecf8881b933b1eb573535a543a03", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -347,11 +346,11 @@ ] }, "locked": { - "lastModified": 1756806479, - "narHash": "sha256-+RLX4BmuMw4c97npsBcjjEuy+s83POX9Yp8Nkj499lA=", + "lastModified": 1757774228, + "narHash": "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b8d6d369618078b2dbb043480ca65fe3521f273b", + "rev": "5ff379f4e525183cc6766ea95764b52ec97d8966", "type": "github" }, "original": { @@ -554,11 +553,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1757296410, - "narHash": "sha256-vXYNuMUggreF8lrupnQRzEQg+NXxE6++/KMp2iLom+8=", + "lastModified": 1757814419, + "narHash": "sha256-wmlDAkOrwX9cvhXQa7wekGr/5G6SfE2D5KlvuvSEEXc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "615148794c092768c39017bffae1eec410515870", + "rev": "17db183a6a2ba1217bbfc123b47d4b5ee70b256a", "type": "github" }, "original": { @@ -595,11 +594,11 @@ ] }, "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -610,11 +609,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -656,11 +655,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -718,11 +717,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1756911493, - "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -734,16 +733,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -887,11 +886,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1757308755, - "narHash": "sha256-daEx9piqNWMVsfJx91O2lKtSTPUXnanS755M1oo5zLU=", + "lastModified": 1758169356, + "narHash": "sha256-H/2LVdr5GLOD7k19DsHSzSXVPb5SaOPrjuPJx974ojU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "36f0082103e6a4f3ec51e5c48a4c79426c8c6853", + "rev": "7f504a4b425a245e0b911442234448323bb48945", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d00ea44..f5d2032 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; nixos-hardware.url = "github:NixOS/nixos-hardware"; @@ -15,7 +16,8 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + #url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home.nix b/home.nix index 009c34e..d158a56 100644 --- a/home.nix +++ b/home.nix @@ -18,6 +18,15 @@ in stateVersion = "24.05"; packages = with pkgs; [ +# dioxus-cli + cosmic-files + cosmic-player + cosmic-screenshot + cosmic-applibrary + cosmic-ext-calculator + examine + + flix postgresql upower usbutils @@ -78,7 +87,7 @@ in xournalpp simple-scan godot_4 - rar + #rar wootility surrealdb pico-sdk @@ -98,7 +107,8 @@ in nerd-fonts.fira-code iosevka kitty - rofi-wayland + #rofi-wayland + rofi discord vesktop spotify @@ -125,7 +135,7 @@ in wireguard-tools mongodb-compass unstable.mongodb-tools - hashcat + #hashcat tldr dunst grim @@ -156,7 +166,7 @@ in heroic heaptrack - cinny-desktop + #cinny-desktop gping gparted valgrind @@ -189,7 +199,7 @@ in socat websocat whois - wifite2 + #wifite2 dig httpie inxi @@ -222,7 +232,7 @@ in python312Packages.pypykatz screen openvpn - ghostty + #ghostty mdbook nix-tree diff --git a/powersave.nix b/powersave.nix index b290037..b28a77b 100644 --- a/powersave.nix +++ b/powersave.nix @@ -96,7 +96,6 @@ services.locate.enable = false; services.openssh.enable = lib.mkForce false; programs.java.enable = lib.mkForce false; - services.upower.enable = lib.mkForce false; services = { xserver.windowManager.fvwm2.gestures = lib.mkForce false; libinput.enable = lib.mkForce false; diff --git a/remove-old-nix.sh b/remove-old-nix.sh index 1aca04b..9af2613 100644 --- a/remove-old-nix.sh +++ b/remove-old-nix.sh @@ -1,4 +1,4 @@ # sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 30d # nix-env --delete-generations 30d # nix-collect-garbage -nh clean all -k 4 # -K 10d +nh clean all -k 3 # -K 10d