diff --git a/flake.lock b/flake.lock index 960f7e0..5c4c000 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739957290, - "narHash": "sha256-Qg4I6ir9XfV+ZOi5YeuLPvUmIbkeXK8OvjoFf+qn1/I=", + "lastModified": 1740068591, + "narHash": "sha256-NEJbSn9pVilpyXmoqo+DY8PRu2uEzema0np1ye/Id8M=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e9632a65f5be82a51decac2020b0b360215f456", + "rev": "f9830d78de821c22aabbd55b1a9ba57f7a79ce37", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1739913864, - "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", + "lastModified": 1740060750, + "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", "owner": "nix-community", "repo": "home-manager", - "rev": "97ac0801d187b2911e8caa45316399de12f6f199", + "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739944956, - "narHash": "sha256-qGOyv8cudQw1KIHNckU/eo09zjcc4NPis8J4v+XeXDE=", + "lastModified": 1740045415, + "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8bfb763f07fd9106e032590d071c30450e3b80f6", + "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739940569, - "narHash": "sha256-r624MtdcINkMlyXvvizg8b6Ig1fv4lLvjdgKM2ejaS0=", + "lastModified": 1740042509, + "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=", "owner": "YaLTeR", "repo": "niri", - "rev": "74787843430cff26c5308e95051b7e9f5dc4252c", + "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3", "type": "github" }, "original": { @@ -912,11 +912,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -960,11 +960,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739960481, - "narHash": "sha256-+s4de3n935dZLoW/EVGTbeZrVW2gR1Xzrxr+Rbh4pok=", + "lastModified": 1740056577, + "narHash": "sha256-Q4ICEFcl9tnnih08DElTJ2vuMzMRrrgdJ7v8NrJxo5c=", "owner": "sxyazi", "repo": "yazi", - "rev": "4465101089ffe7b4d758a3de949084cc556ac979", + "rev": "c14bbecb1a5524e769a93af125d07848c2d6a0be", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index df37833..882b640 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -3,21 +3,13 @@ imports = with nix-config.homeModules; [ # mako - mpv yazi - hyprlock - hypridle shell-conf # shell, shell utils, cli tools, libs, tui's email - gnome - niri - waybar desktop music langs emacs - swaync - shikane ]; home = { diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 67373b6..86f8ebc 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -2,6 +2,18 @@ { + imports = with nix-config.homeModules; [ + niri + waybar + swaync + shikane + mpv + gnome + + hyprlock + hypridle + ]; + home.packages = lib.mkMerge [ (with nix-config.packages.x86_64-linux; [ filen-desktop diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 0be90a8..18da6c1 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -28,7 +28,7 @@ in { touchpad = { natural-scroll = true; scroll-method = "two-finger"; - dwt = true; + dwt = false; tap = false; tap-button-map = "left-right-middle"; click-method = "clickfinger"; diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 2908fab..cfa84c8 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -55,7 +55,7 @@ numbat glpng nurl - neofetch + fastfetch nvd ripgrep-all silver-searcher diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index d1e8ec8..679ffbc 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -10,6 +10,7 @@ { on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "drag selection";} { on = "y"; run = ["shell 'for path in \"$@\"; do echo \"file://$path\"; done | wl-copy -t text/uri-list'\n" "yank"]; } { on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "go to top of git repo"; } + { on = ["g" "p"]; run = "cd ~/Projects"; desc = "go to ~/Projects"; } { on = ["t" "p"]; run = "plugin toggle-view parent"; desc = "Toggle parent"; } { on = ["t" "c"]; run = "plugin toggle-view current"; desc = "Toggle current"; } { on = ["t" "r"]; run = "plugin toggle-view preview"; desc = "Toggle preview"; } diff --git a/modules/system/filesystems.nix b/modules/system/filesystems.nix index f1f8573..d09765b 100644 --- a/modules/system/filesystems.nix +++ b/modules/system/filesystems.nix @@ -9,33 +9,33 @@ in { "/mnt/filez/media" = { - device = "//100.70.114.113/Media"; + device = "//filez/Media"; fsType = "smb3"; options = [ "${filez-opts}" ]; }; "/mnt/filez/music-production" = { - device = "//100.70.114.113/Music Production"; + device = "//filez/Music Production"; fsType = "smb3"; options = [ "${filez-opts}" ]; }; "/mnt/filez/storage" = { - device = "//100.70.114.113/Storage"; + device = "//filez/Storage"; fsType = "smb3"; options = [ "${filez-opts}" ]; }; "/mnt/filez/photos" = { - device = "//100.70.114.113/Photo Storage"; + device = "//filez/Photo Storage"; fsType = "smb3"; options = [ "${filez-opts}" ]; }; - "/mnt/beets-import" = { - device = "//100.103.170.132/media"; - fsType = "smb3"; - options = [ "${media-server-opts}" ]; - }; + # "/mnt/media-server/import" = { + # device = "//media-server/import"; + # # fsType = "smb3"; + # options = [ "${media-server-opts}" ]; + # }; }; } diff --git a/overlays/openrazer.nix b/overlays/openrazer.nix index 497093c..c4cfac2 100644 --- a/overlays/openrazer.nix +++ b/overlays/openrazer.nix @@ -1,11 +1,27 @@ -final: prev: { - development.python-modules.openrazer = prev.development.python-modules.openrazer.overrideAttrs (old: { +self: super: { + # linuxPackages = super.linuxPackages.extend (lpself: lpsuper: { + # openrazer = super.linuxPackages.openrazer.overrideAttrs (old: { + + # }); + # }); + + openrazer-daemon = super.openrazer-daemon.overrideAttrs (old: { version = "master"; - src = prev.fetchFromGitHub { + src = super.fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "master"; - hash = "sha256-5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - }; + hash = "sha256-Qon3wDQLxSRuWRl7WSI6CIg7EfEJ+rYJiRKVGwC5b6A="; + }; + }); + + development.python-modules.openrazer = super.development.python-modules.openrazer.overrideAttrs (old: { + version = "master"; + src = super.fetchFromGitHub { + owner = "openrazer"; + repo = "openrazer"; + rev = "master"; + hash = "sha256-Qon3wDQLxSRuWRl7WSI6CIg7EfEJ+rYJiRKVGwC5b6A="; + }; }); }