diff --git a/flake.lock b/flake.lock index 81b810e..288ec25 100644 --- a/flake.lock +++ b/flake.lock @@ -490,30 +490,20 @@ "inputs": { "hyprland": [ "hyprland" - ], - "nixpkgs": [ - "hycov", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hycov", - "hyprland", - "systems" ] }, "locked": { - "lastModified": 1719328349, - "narHash": "sha256-upIUl8IE5ow+CJKa2SIo3OL/djarGVr8pNe1j05uW1A=", + "lastModified": 1718188849, + "narHash": "sha256-bNlu9Iv/BDMbuqtDSHbS082XBA2kKW9jCMLXeprmkxI=", "owner": "DreamMaoMao", "repo": "hycov", - "rev": "de15cdd6bf2e46cbc69735307f340b57e2ce3dd0", + "rev": "3d144a79f8b5468656de88a005be55f3317d295b", "type": "github" }, "original": { "owner": "DreamMaoMao", "repo": "hycov", - "rev": "de15cdd6bf2e46cbc69735307f340b57e2ce3dd0", + "rev": "3d144a79f8b5468656de88a005be55f3317d295b", "type": "github" } }, @@ -533,11 +523,11 @@ ] }, "locked": { - "lastModified": 1718450675, - "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -546,32 +536,10 @@ "type": "github" } }, - "hyprgrass": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1718401180, - "narHash": "sha256-DfM2BqnFW48NlHkBfC7ErHgK7WHlOgiiE+aFetN/yJ4=", - "owner": "horriblename", - "repo": "hyprgrass", - "rev": "736119f828eecaed2deaae1d6ff1f50d6dabaaba", - "type": "github" - }, - "original": { - "owner": "horriblename", - "repo": "hyprgrass", - "rev": "736119f828eecaed2deaae1d6ff1f50d6dabaaba", - "type": "github" - } - }, "hyprland": { "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", - "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" @@ -580,16 +548,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719317162, - "narHash": "sha256-JmfnYz+9a4TjNl3mAus1VpoWtTI9d1xkW9MHbkcV0Po=", - "rev": "918d8340afd652b011b937d29d5eea0be08467f5", - "revCount": 4886, + "lastModified": 1718029386, + "narHash": "sha256-iX/l3UT8iXu8psu2UirFX11Yg2zYwpgzoXB32oM3N3U=", + "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f", + "revCount": 4794, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "rev": "918d8340afd652b011b937d29d5eea0be08467f5", + "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -612,17 +580,17 @@ ] }, "locked": { - "lastModified": 1719318037, - "narHash": "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA=", + "lastModified": 1718111105, + "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "3ae670253a5a3ae1e3a3104fb732a8c990a31487", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "3ae670253a5a3ae1e3a3104fb732a8c990a31487", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" } }, @@ -640,11 +608,11 @@ ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -655,10 +623,6 @@ }, "hyprlang": { "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -669,11 +633,11 @@ ] }, "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", "type": "github" }, "original": { @@ -682,31 +646,6 @@ "type": "github" } }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1719316102, - "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -719,11 +658,11 @@ ] }, "locked": { - "lastModified": 1719067853, - "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "914f083741e694092ee60a39d31f693d0a6dc734", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -1306,7 +1245,6 @@ "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "hycov": "hycov", - "hyprgrass": "hyprgrass", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", @@ -1503,11 +1441,11 @@ ] }, "locked": { - "lastModified": 1718619174, - "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6a51d56..4ed61c6 100644 --- a/flake.nix +++ b/flake.nix @@ -212,15 +212,16 @@ type = "git"; url = "https://github.com/hyprwm/Hyprland"; submodules = true; - rev = "918d8340afd652b011b937d29d5eea0be08467f5"; + rev = "ea2501d4556f84d3de86a4ae2f4b22a474555b9f"; }; hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-plugins.url = "github:hyprwm/hyprland-plugins/3ae670253a5a3ae1e3a3104fb732a8c990a31487"; + hyprland-plugins.url = "github:hyprwm/hyprland-plugins/151102b7d7c4f61ff42f275e72008d28318dac96"; hyprland-plugins.inputs.hyprland.follows = "hyprland"; - hycov.url = "github:DreamMaoMao/hycov/de15cdd6bf2e46cbc69735307f340b57e2ce3dd0"; + hycov.url = "github:DreamMaoMao/hycov/3d144a79f8b5468656de88a005be55f3317d295b"; hycov.inputs.hyprland.follows = "hyprland"; - hyprgrass.url = "github:horriblename/hyprgrass/736119f828eecaed2deaae1d6ff1f50d6dabaaba"; - hyprgrass.inputs.hyprland.follows = "hyprland"; + # FIXME hyprgrass broken on 0.41.0 + #hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; + #hyprgrass.inputs.hyprland.follows = "hyprland"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; diff --git a/user/app/browser/qutebrowser.nix b/user/app/browser/qutebrowser.nix index e061a79..5b72912 100644 --- a/user/app/browser/qutebrowser.nix +++ b/user/app/browser/qutebrowser.nix @@ -105,16 +105,6 @@ in programs.qutebrowser.enable = true; programs.qutebrowser.extraConfig = '' -import sys -import os.path -secretsExists = False -secretFile = os.path.expanduser("~/.config/qutebrowser/qutesecrets.py") - -if (os.path.isfile(secretFile)): - sys.path.append(os.path.dirname(secretFile)) - import qutesecrets - secretsExists = True - config.set('qt.args',['ignore-gpu-blacklist','enable-gpu-rasterization','enable-native-gpu-memory-buffers','num-raster-threads=4']) config.load_autoconfig(False) @@ -194,20 +184,8 @@ config.set('fileselect.folder.command', ['kitty','-e','ranger','--choosedir={}'] # bindings from doom emacs config.bind('', 'cmd-set-text :') -config.bind('.', 'cmd-set-text :') -config.bind('b', 'bookmark-list') -config.bind('h', 'history') -config.bind('gh', 'open https://github.com') -config.bind('gl', 'open https://gitlab.com') -config.bind('gc', 'open https://codeberg.org') -if (secretsExists): - config.bind('gg', 'open '+qutesecrets.mygiteadomain) config.bind('', 'completion-item-focus prev', mode='command') config.bind('', 'completion-item-focus next', mode='command') -config.bind('', 'fake-key ', mode='normal') -config.bind('', 'fake-key ', mode='normal') -config.bind('', 'fake-key ', mode='insert') -config.bind('', 'fake-key ', mode='insert') # bindings from vimium config.bind('t', 'open -t') diff --git a/user/app/ranger/colorschemes/hail.py b/user/app/ranger/colorschemes/hail.py index 9a04f53..9c6cbb9 100644 --- a/user/app/ranger/colorschemes/hail.py +++ b/user/app/ranger/colorschemes/hail.py @@ -40,7 +40,7 @@ class Default(ColorScheme): fg = red if context.directory: attr |= bold - fg = red + fg = blue fg += BRIGHT elif context.executable: attr |= bold @@ -94,7 +94,7 @@ class Default(ColorScheme): if context.hostname: fg = red if context.bad else green elif context.directory: - fg = red + fg = blue elif context.tab: if context.good: bg = green diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 7778e12..7538a31 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -6,6 +6,7 @@ in ../../app/terminal/alacritty.nix ../../app/terminal/kitty.nix (import ../../app/dmenu-scripts/networkmanager-dmenu.nix { + #dmenu_command = "fuzzel -d -f ${userSettings.font} :size=16"; inherit config lib pkgs; dmenu_command = "fuzzel -d"; inherit config lib pkgs; }) ../input/nihongo.nix @@ -28,7 +29,8 @@ in plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails inputs.hycov.packages.${pkgs.system}.hycov - inputs.hyprgrass.packages.${pkgs.system}.default + # FIXME hypgrass currently broken on 0.41.0 + #inputs.hyprgrass.packages.${pkgs.system}.default ]; settings = { }; extraConfig = '' @@ -127,30 +129,33 @@ in show_special = 0 # show windwos in special workspace in overview. } - touch_gestures { - sensitivity = 4.0 - long_press_delay = 260 - hyprgrass-bind = , edge:r:l, exec, hyprnome - hyprgrass-bind = , edge:l:r, exec, hyprnome --previous - hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + # FIXME hypgrass currently broken on 0.41.0 :( + #touch_gestures { + # sensitivity = 4.0 + # long_press_delay = 260 + # hyprgrass-bind = , edge:r:l, exec, hyprnome + # hyprgrass-bind = , edge:l:r, exec, hyprnome --previous + # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - hyprgrass-bind = , swipe:3:u, hycov:toggleoverview - hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + # hyprgrass-bind = , swipe:3:u, hycov:toggleoverview + # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous - hyprgrass-bind = , swipe:3:r, exec, hyprnome + # hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous + # hyprgrass-bind = , swipe:3:r, exec, hyprnome - hyprgrass-bind = , swipe:4:u, movewindow,u - hyprgrass-bind = , swipe:4:d, movewindow,d - hyprgrass-bind = , swipe:4:l, movewindow,l - hyprgrass-bind = , swipe:4:r, movewindow,r + # hyprgrass-bind = , swipe:4:u, movewindow,u + # hyprgrass-bind = , swipe:4:d, movewindow,d + # hyprgrass-bind = , swipe:4:l, movewindow,l + # hyprgrass-bind = , swipe:4:r, movewindow,r - hyprgrass-bind = , tap:3, fullscreen,1 - hyprgrass-bind = , tap:4, fullscreen,0 + # hyprgrass-bind = , tap:3, fullscreen,1 + # hyprgrass-bind = , tap:4, fullscreen,0 - hyprgrass-bindm = , longpress:2, movewindow - hyprgrass-bindm = , longpress:3, resizewindow - } + # hyprgrass-bindm = , longpress:2, movewindow + # hyprgrass-bindm = , longpress:3, resizewindow + + + #} } bind=SUPER,SUPER_L,exec,nwggrid-wrapper