Compare commits

..

6 commits

11 changed files with 75 additions and 60 deletions

View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1719745305,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718879355, "lastModified": 1719259945,
"narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +132,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718018037, "lastModified": 1719226092,
"narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718530513, "lastModified": 1719827385,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1719150233, "lastModified": 1719786368,
"narHash": "sha256-HOt6FGQdTRIitp5agm3tnZ/4OYM6RG6KOm3UGMntlrY=", "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e09addf8dede9a8e7f2dd0e5bb414d3a0d5dc471", "rev": "d7ea1b7785f31e9fd6477490309721a19a835592",
"revCount": 4878, "revCount": 4900,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -309,11 +309,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718804078, "lastModified": 1719316102,
"narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=", "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "4f1351295c55a8f51219b25aa4a6497a067989d0", "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718119275, "lastModified": 1719067853,
"narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "1419520d5f7f38d35e05504da5c1b38212a38525", "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,11 +357,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1719151941, "lastModified": 1719858211,
"narHash": "sha256-6DlzbOUC14DN3ChG6YDfHp3dlyRunlCuNIGiJ0/j0SU=", "narHash": "sha256-pBGMc6ZkGL4NiJAF+w/PmGeSE3Zohf4vxPcfwYT5qf0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "8fbf3ad99db5af164230b7965de5572ce238c0da", "rev": "5d66451b2345a22a9c5ab3a424d2f15a5ba4f42b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719082813, "lastModified": 1719700831,
"narHash": "sha256-C2stSASvUp0XHljA6iZfDFHSH0JIDJ0g7g0uQUIHU2E=", "narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "6c3f7e7e27a0ffcf6d58dc1f5ad2fce7e59a2d88", "rev": "e7020306a19a5211c834966ec067fff3b981bdb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +393,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719111455, "lastModified": 1719832725,
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +408,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718530797, "lastModified": 1719075281,
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719099622, "lastModified": 1719663039,
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,11 +440,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719690277,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +455,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718983919, "lastModified": 1719468428,
"narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90338afd6177fc683a04d934199d693708c85a3b", "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,11 +471,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1719838683,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -486,11 +486,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1719153056, "lastModified": 1719901085,
"narHash": "sha256-nIp6HOIrPTMeIoaaj8MavebUI1HBeq1iz9P0nzWq1CI=", "narHash": "sha256-p26RNyfJbyrPbE5uFPSjwaAxoeiiy2s1yUDldP7+UEM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "46ab9f286d5546781726537039455867a59c19a3", "rev": "c5f343d1b90038dd4a7fb636580c08b2b0e59ef9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,11 +520,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1719111739, "lastModified": 1719873517,
"narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", "rev": "a11224af8d824935f363928074b4717ca2e280db",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,6 +5,7 @@
./chromium.nix ./chromium.nix
./dbeaver.nix ./dbeaver.nix
./discord.nix ./discord.nix
./easyeffects.nix
./git.nix ./git.nix
./github.nix ./github.nix
./go.nix ./go.nix
@ -23,8 +24,8 @@
./variety.nix ./variety.nix
./vscode.nix ./vscode.nix
./whatsapp.nix ./whatsapp.nix
./zsh.nix
./zathura.nix ./zathura.nix
./zsh.nix
]; ];
programs.fzf = { programs.fzf = {

View file

@ -0,0 +1,9 @@
{ config, lib, pkgs, ... }:
let
cfg = config.profile.programs.easyeffects;
in
{
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ easyeffects ];
};
}

View file

@ -22,7 +22,7 @@ in
ping = "${pkgs.unixtools.ping}/bin/ping"; ping = "${pkgs.unixtools.ping}/bin/ping";
host = "github.com"; host = "github.com";
sleep = "${pkgs.coreutils}/bin/sleep"; sleep = "${pkgs.coreutils}/bin/sleep";
script = pkgs.writeScriptBin "clone-nvim.sh" '' script = pkgs.writeScriptBin "clone-nvim.sh" /*bash*/ ''
#!${bash} #!${bash}
if [ -d "${nvimCloneDir}" ]; then if [ -d "${nvimCloneDir}" ]; then

View file

@ -40,13 +40,13 @@
save = 40000; save = 40000;
size = 40000; size = 40000;
}; };
initExtraFirst = '' initExtraFirst = /*bash*/ ''
_ZSH_COLOR_SCHEME_FILE=$HOME/.cache/wallust/sequences _ZSH_COLOR_SCHEME_FILE=$HOME/.cache/wallust/sequences
if [ -f "$_ZSH_COLOR_SCHEME_FILE" ]; then if [ -f "$_ZSH_COLOR_SCHEME_FILE" ]; then
(cat "$_ZSH_COLOR_SCHEME_FILE" &) (cat "$_ZSH_COLOR_SCHEME_FILE" &)
fi fi
''; '';
initExtra = '' initExtra = /*bash*/ ''
bindkey '^I' menu-complete bindkey '^I' menu-complete
bindkey "$terminfo[kcbt]" reverse-menu-complete bindkey "$terminfo[kcbt]" reverse-menu-complete
''; '';
@ -57,7 +57,7 @@
"zsh-users/zsh-autosuggestions kind:defer" "zsh-users/zsh-autosuggestions kind:defer"
"zsh-users/zsh-history-substring-search kind:defer" "zsh-users/zsh-history-substring-search kind:defer"
"zsh-users/zsh-completions" "zsh-users/zsh-completions"
"marlonrichert/zsh-autocomplete" # "marlonrichert/zsh-autocomplete"
]; ];
}; };
}; };

View file

@ -14,6 +14,7 @@
hostname = lib.mkOption { hostname = lib.mkOption {
type = lib.types.str; type = lib.types.str;
}; };
networking.disableWaitOnline = lib.mkEnableOption "disable waiting for network";
networking.externalInterface = lib.mkOption { networking.externalInterface = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "eth0"; default = "eth0";

View file

@ -82,6 +82,7 @@
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;
}; };
easyeffects.enable = lib.mkEnableOption "easyeffects";
}; };
}; };
} }

View file

@ -40,7 +40,7 @@ in
DP-2 = [ 8 9 10 ]; DP-2 = [ 8 9 10 ];
}; };
pyprland.wallpaper-dirs = [ "/nas/redmage/images/windows" ]; pyprland.wallpaper-dirs = [ "/nas/redmage/images/windows" ];
wallust.alpha = 90; wallust.alpha = 80;
swayosd.display = "DP-1"; swayosd.display = "DP-1";
dunst.monitor = "1"; dunst.monitor = "1";
}; };
@ -80,5 +80,6 @@ in
home.programs = { home.programs = {
zathura.enable = true; zathura.enable = true;
}; };
programs.easyeffects.enable = true;
}; };
} }

View file

@ -7,6 +7,7 @@
profile = { profile = {
hostname = "homeserver"; hostname = "homeserver";
networking.externalInterface = "enp9s0"; networking.externalInterface = "enp9s0";
networking.disableWaitOnline = true;
user = { user = {
name = "homeserver"; name = "homeserver";
fullName = "Homeserver"; fullName = "Homeserver";

View file

@ -14,6 +14,7 @@
security.sudo.wheelNeedsPassword = config.profile.security.sudo.wheelNeedsPassword; security.sudo.wheelNeedsPassword = config.profile.security.sudo.wheelNeedsPassword;
networking.hostName = config.profile.hostname; networking.hostName = config.profile.hostname;
systemd.services.NetworkManager-wait-online.enable = !config.profile.networking.disableWaitOnline;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -102,8 +102,8 @@ in
}; };
}; };
}; };
overrideFolders = true; overrideFolders = false;
overrideDevices = true; overrideDevices = false;
openDefaultPorts = true; openDefaultPorts = true;
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
user = user.name; user = user.name;