emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactoring

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-02-20 13:51:36 -05:00
parent 5f2a3018c3
commit cfdeb09d16
8 changed files with 69 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.lock generated
View file

@ -69,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1739957290, "lastModified": 1740068591,
"narHash": "sha256-Qg4I6ir9XfV+ZOi5YeuLPvUmIbkeXK8OvjoFf+qn1/I=", "narHash": "sha256-NEJbSn9pVilpyXmoqo+DY8PRu2uEzema0np1ye/Id8M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4e9632a65f5be82a51decac2020b0b360215f456", "rev": "f9830d78de821c22aabbd55b1a9ba57f7a79ce37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739913864, "lastModified": 1740060750,
"narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "97ac0801d187b2911e8caa45316399de12f6f199", "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -712,11 +712,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1739944956, "lastModified": 1740045415,
"narHash": "sha256-qGOyv8cudQw1KIHNckU/eo09zjcc4NPis8J4v+XeXDE=", "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "8bfb763f07fd9106e032590d071c30450e3b80f6", "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739940569, "lastModified": 1740042509,
"narHash": "sha256-r624MtdcINkMlyXvvizg8b6Ig1fv4lLvjdgKM2ejaS0=", "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "74787843430cff26c5308e95051b7e9f5dc4252c", "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -912,11 +912,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1739758141, "lastModified": 1739923778,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791", "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -928,11 +928,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1739758141, "lastModified": 1739923778,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791", "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -960,11 +960,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1739758141, "lastModified": 1739923778,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791", "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1429,11 +1429,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1739960481, "lastModified": 1740056577,
"narHash": "sha256-+s4de3n935dZLoW/EVGTbeZrVW2gR1Xzrxr+Rbh4pok=", "narHash": "sha256-Q4ICEFcl9tnnih08DElTJ2vuMzMRrrgdJ7v8NrJxo5c=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "4465101089ffe7b4d758a3de949084cc556ac979", "rev": "c14bbecb1a5524e769a93af125d07848c2d6a0be",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
homes/emenel/default.nix
View file

@ -3,21 +3,13 @@
imports = with nix-config.homeModules; [ imports = with nix-config.homeModules; [
# mako # mako
mpv
yazi yazi
hyprlock
hypridle
shell-conf # shell, shell utils, cli tools, libs, tui's shell-conf # shell, shell utils, cli tools, libs, tui's
email email
gnome
niri
waybar
desktop desktop
music music
langs langs
emacs emacs
swaync
shikane
]; ];
home = { home = {

12
modules/home/desktop.nix
View file

@ -2,6 +2,18 @@
{ {
imports = with nix-config.homeModules; [
niri
waybar
swaync
shikane
mpv
gnome
hyprlock
hypridle
];
home.packages = lib.mkMerge [ home.packages = lib.mkMerge [
(with nix-config.packages.x86_64-linux; [ (with nix-config.packages.x86_64-linux; [
filen-desktop filen-desktop

2
modules/home/niri.nix
View file

@ -28,7 +28,7 @@ in {
touchpad = { touchpad = {
natural-scroll = true; natural-scroll = true;
scroll-method = "two-finger"; scroll-method = "two-finger";
dwt = true; dwt = false;
tap = false; tap = false;
tap-button-map = "left-right-middle"; tap-button-map = "left-right-middle";
click-method = "clickfinger"; click-method = "clickfinger";

2
modules/home/shell-conf.nix
View file

@ -55,7 +55,7 @@
numbat numbat
glpng glpng
nurl nurl
neofetch fastfetch
nvd nvd
ripgrep-all ripgrep-all
silver-searcher silver-searcher

1
modules/home/yazi.nix
View file

@ -10,6 +10,7 @@
{ on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "drag selection";} { 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 = "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" "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" "p"]; run = "plugin toggle-view parent"; desc = "Toggle parent"; }
{ on = ["t" "c"]; run = "plugin toggle-view current"; desc = "Toggle current"; } { on = ["t" "c"]; run = "plugin toggle-view current"; desc = "Toggle current"; }
{ on = ["t" "r"]; run = "plugin toggle-view preview"; desc = "Toggle preview"; } { on = ["t" "r"]; run = "plugin toggle-view preview"; desc = "Toggle preview"; }

18
modules/system/filesystems.nix
View file

@ -9,33 +9,33 @@
in { in {
"/mnt/filez/media" = { "/mnt/filez/media" = {
device = "//100.70.114.113/Media"; device = "//filez/Media";
fsType = "smb3"; fsType = "smb3";
options = [ "${filez-opts}" ]; options = [ "${filez-opts}" ];
}; };
"/mnt/filez/music-production" = { "/mnt/filez/music-production" = {
device = "//100.70.114.113/Music Production"; device = "//filez/Music Production";
fsType = "smb3"; fsType = "smb3";
options = [ "${filez-opts}" ]; options = [ "${filez-opts}" ];
}; };
"/mnt/filez/storage" = { "/mnt/filez/storage" = {
device = "//100.70.114.113/Storage"; device = "//filez/Storage";
fsType = "smb3"; fsType = "smb3";
options = [ "${filez-opts}" ]; options = [ "${filez-opts}" ];
}; };
"/mnt/filez/photos" = { "/mnt/filez/photos" = {
device = "//100.70.114.113/Photo Storage"; device = "//filez/Photo Storage";
fsType = "smb3"; fsType = "smb3";
options = [ "${filez-opts}" ]; options = [ "${filez-opts}" ];
}; };
"/mnt/beets-import" = { # "/mnt/media-server/import" = {
device = "//100.103.170.132/media"; # device = "//media-server/import";
fsType = "smb3"; # # fsType = "smb3";
options = [ "${media-server-opts}" ]; # options = [ "${media-server-opts}" ];
}; # };
}; };
} }

26
overlays/openrazer.nix
View file

@ -1,11 +1,27 @@
final: prev: { self: super: {
development.python-modules.openrazer = prev.development.python-modules.openrazer.overrideAttrs (old: { # linuxPackages = super.linuxPackages.extend (lpself: lpsuper: {
# openrazer = super.linuxPackages.openrazer.overrideAttrs (old: {
# });
# });
openrazer-daemon = super.openrazer-daemon.overrideAttrs (old: {
version = "master"; version = "master";
src = prev.fetchFromGitHub { src = super.fetchFromGitHub {
owner = "openrazer"; owner = "openrazer";
repo = "openrazer"; repo = "openrazer";
rev = "master"; 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=";
};
}); });
} }