dan/dotfiles
1
0
Fork 0
mirror of https://github.com/danbulant/dotfiles synced 2026-05-24 12:35:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to unstable

Browse source
This commit is contained in:
Daniel Bulant 2025-09-18 09:21:19 +02:00
parent 1163b4daf0
commit 2df72c619b
No known key found for this signature in database
9 changed files with 76 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.config/carapace/init.nu
View file

@ -6,14 +6,14 @@ def --env unset-env [name] { hide-env $name }
let carapace_completer = {|spans| let carapace_completer = {|spans|
# if the current command is an alias, get it's expansion # 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 # overwrite
let spans = (if $expanded_alias != null { let spans = (if $expanded_alias != null {
# put the first word of the expanded alias first in the span # put the first word of the expanded alias first in the span
$spans | skip 1 | prepend ($expanded_alias | split row " " | take 1) $spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
} else { } else {
$spans $spans | skip 1 | prepend ($spans.0)
}) })
carapace $spans.0 nushell ...$spans 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 = ($current.completions | default {} external)
$current.completions.external = ($current.completions.external $current.completions.external = ($current.completions.external
| default true enable | 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 $env.config = $current

18
.config/hypr/hyprland.conf
View file

@ -22,9 +22,9 @@ cursor {
no_hardware_cursors = true no_hardware_cursors = true
} }
render { #render {
explicit_sync = false #explicit_sync = false
} #}
source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/monitors.conf
source = ~/.config/hypr/workspaces.conf source = ~/.config/hypr/workspaces.conf
@ -232,10 +232,13 @@ master {
#new_is_master = false #new_is_master = false
} }
gestures { #gestures {
# See https://wiki.hyprland.org/Configuring/Variables/ for more # 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 # Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more # 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=$mainMod,K,exec,kitty
bind=SUPER,B,exec,vivaldi-stable bind=SUPER,B,exec,vivaldi-stable
bind = super+ctrl, q, exit, 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 #! current window management
bind = $mainMod, Q, killactive, bind = $mainMod, Q, killactive,
# bind = $mainMod, V, togglefloating, # bind = $mainMod, V, togglefloating,

12
.config/nushell/git-completions.nu
View file

@ -82,7 +82,7 @@ module git-completion-utils {
} }
export def get-all-git-branches []: nothing -> list<string> { export def get-all-git-branches []: nothing -> list<string> {
^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 # 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'] # and we pick ['feature/awesome-2', 'awesome-3']
let lines = $in let lines = $in
let long_current = if ($current | is-empty) { '' } else { $'origin/($current)' } 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 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 { $floating_remotes | each {
let v = $in | split row -n 2 '/' | get 1 let v = $in | split row -n 2 '/' | get 1
if $v == $current { null } else $v if $v == $current { null } else $v
@ -115,10 +115,10 @@ module git-completion-utils {
export def extract-mergable-sources [current: string]: list<string> -> list<record<value: string, description: string>> { export def extract-mergable-sources [current: string]: list<string> -> list<record<value: string, description: string>> {
let lines = $in let lines = $in
let long_current = if ($current | is-empty) { '' } else { $'origin/($current)' } 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<record<n: string, u: string>> = $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 git_table: list<record<n: string, u: string>> = $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 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)] [...($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" [] { def "nu-complete git switch" [] {
use git-completion-utils * use git-completion-utils *
let current = (^git branch --show-current) # Can be empty if in detached HEAD 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' let remote_branches = (get-all-git-branches | extract-remote-branches-nonlocal-short $current) | wrap value | insert description 'Remote branch'
[...$local_branches, ...$remote_branches] [...$local_branches, ...$remote_branches]
} }

30
configuration.nix
View file

@ -28,6 +28,7 @@ in
"olm-3.2.16" "olm-3.2.16"
"cinny-unwrapped-4.2.3" "cinny-unwrapped-4.2.3"
"cinny-4.2.3" "cinny-4.2.3"
"libsoup-2.74.3"
# "qbittorrent-4.6.4" # "qbittorrent-4.6.4"
# "cinny-3.2.0" # "cinny-3.2.0"
"dotnet-sdk-wrapped-7.0.410" "dotnet-sdk-wrapped-7.0.410"
@ -429,34 +430,7 @@ in
]; ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
networking.firewall.enable = false; networking.firewall.enable = false;
hardware.wooting.enable = true;
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"
'';
services.syncthing = { services.syncthing = {
enable = true; enable = true;

63
flake.lock
View file

@ -65,11 +65,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1757318914, "lastModified": 1758061721,
"narHash": "sha256-YFPa/eXYUA6ZtgTqGij4XVKbfA9S1UA8UEYSTgkob5c=", "narHash": "sha256-+agPUV+fOJSpqjVOEM0xC8+xhBFbnQesyy+8ErwGpks=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "25749b4b5fccfd3f0fc226fb46d574ffd55d1ee8", "rev": "5996a58b20fa015bd404dfdb2cef8892909b3d69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,16 +206,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756679287, "lastModified": 1758160734,
"narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "narHash": "sha256-4YoMTUZRXb2XggJi11lSJnehrwM6u31Ylu2cOzb96JQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "rev": "a504aee7d452ecf8881b933b1eb573535a543a03",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -347,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756806479, "lastModified": 1757774228,
"narHash": "sha256-+RLX4BmuMw4c97npsBcjjEuy+s83POX9Yp8Nkj499lA=", "narHash": "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "b8d6d369618078b2dbb043480ca65fe3521f273b", "rev": "5ff379f4e525183cc6766ea95764b52ec97d8966",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -554,11 +553,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1757296410, "lastModified": 1757814419,
"narHash": "sha256-vXYNuMUggreF8lrupnQRzEQg+NXxE6++/KMp2iLom+8=", "narHash": "sha256-wmlDAkOrwX9cvhXQa7wekGr/5G6SfE2D5KlvuvSEEXc=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "615148794c092768c39017bffae1eec410515870", "rev": "17db183a6a2ba1217bbfc123b47d4b5ee70b256a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -595,11 +594,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757218147, "lastModified": 1757822619,
"narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -610,11 +609,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1757103352, "lastModified": 1757943327,
"narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,11 +655,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1757068644, "lastModified": 1758035966,
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,11 +717,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1756911493, "lastModified": 1757746433,
"narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6a788f552b7b7af703b1a29802a7233c0067908", "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -734,16 +733,16 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1757244434, "lastModified": 1758035966,
"narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "092c565d333be1e17b4779ac22104338941d913f", "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -887,11 +886,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1757308755, "lastModified": 1758169356,
"narHash": "sha256-daEx9piqNWMVsfJx91O2lKtSTPUXnanS755M1oo5zLU=", "narHash": "sha256-H/2LVdr5GLOD7k19DsHSzSXVPb5SaOPrjuPJx974ojU=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "36f0082103e6a4f3ec51e5c48a4c79426c8c6853", "rev": "7f504a4b425a245e0b911442234448323bb48945",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -1,6 +1,7 @@
{ {
inputs = { 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"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
@ -15,7 +16,8 @@
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };

22
home.nix
View file

@ -18,6 +18,15 @@ in
stateVersion = "24.05"; stateVersion = "24.05";
packages = with pkgs; [ packages = with pkgs; [
# dioxus-cli
cosmic-files
cosmic-player
cosmic-screenshot
cosmic-applibrary
cosmic-ext-calculator
examine
flix
postgresql postgresql
upower upower
usbutils usbutils
@ -78,7 +87,7 @@ in
xournalpp xournalpp
simple-scan simple-scan
godot_4 godot_4
rar #rar
wootility wootility
surrealdb surrealdb
pico-sdk pico-sdk
@ -98,7 +107,8 @@ in
nerd-fonts.fira-code nerd-fonts.fira-code
iosevka iosevka
kitty kitty
rofi-wayland #rofi-wayland
rofi
discord discord
vesktop vesktop
spotify spotify
@ -125,7 +135,7 @@ in
wireguard-tools wireguard-tools
mongodb-compass mongodb-compass
unstable.mongodb-tools unstable.mongodb-tools
hashcat #hashcat
tldr tldr
dunst dunst
grim grim
@ -156,7 +166,7 @@ in
heroic heroic
heaptrack heaptrack
cinny-desktop #cinny-desktop
gping gping
gparted gparted
valgrind valgrind
@ -189,7 +199,7 @@ in
socat socat
websocat websocat
whois whois
wifite2 #wifite2
dig dig
httpie httpie
inxi inxi
@ -222,7 +232,7 @@ in
python312Packages.pypykatz python312Packages.pypykatz
screen screen
openvpn openvpn
ghostty #ghostty
mdbook mdbook
nix-tree nix-tree

1
powersave.nix
View file

@ -96,7 +96,6 @@
services.locate.enable = false; services.locate.enable = false;
services.openssh.enable = lib.mkForce false; services.openssh.enable = lib.mkForce false;
programs.java.enable = lib.mkForce false; programs.java.enable = lib.mkForce false;
services.upower.enable = lib.mkForce false;
services = { services = {
xserver.windowManager.fvwm2.gestures = lib.mkForce false; xserver.windowManager.fvwm2.gestures = lib.mkForce false;
libinput.enable = lib.mkForce false; libinput.enable = lib.mkForce false;

2
remove-old-nix.sh
View file

@ -1,4 +1,4 @@
# sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 30d # sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 30d
# nix-env --delete-generations 30d # nix-env --delete-generations 30d
# nix-collect-garbage # nix-collect-garbage
nh clean all -k 4 # -K 10d nh clean all -k 3 # -K 10d