m3tam3re/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0711

Browse Source
This commit is contained in:
m3tam3re 2024-11-07 10:50:13 +01:00
parent 5c0ad5d634
commit 6b24828482
14 changed files with 76 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.webui_secret_key
View File

@ -1 +0,0 @@
nsbiTxOUmVxZGmgl

54
flake.lock generated
View File

@ -23,11 +23,11 @@
]
},
"locked": {
"lastModified": 1726817922,
"narHash": "sha256-gO91NgBTTbVHBlvnn6g6XFeXzJquBH5MrVhYMFTnB0Q=",
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f48b181f0161db6246a1bd1b05d70a7b3a87ab41",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
@ -38,11 +38,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@ -52,13 +52,45 @@
"type": "github"
}
},
"nixpkgs-stable": {
"nixpkgs-a63367c": {
"locked": {
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"lastModified": 1729082675,
"narHash": "sha256-HiLzacvDDFCQw4qwVMLgoCZxGAEsj3PPFOtVZMegEb8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"rev": "a63367cfcdb886bee208f50db8b069f61158861d",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a63367cfcdb886bee208f50db8b069f61158861d",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1730906268,
"narHash": "sha256-JTpBZcKpiz0/Fm5saVrTdPRsywNlBFz5pSdwMaVKwH8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a40c3f1a5a8d3fa81fc4edc9dfa4719f8908b1d8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@ -73,6 +105,8 @@
"dotfiles": "dotfiles",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-a63367c": "nixpkgs-a63367c",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable"
}
}

4
flake.nix
View File

@ -17,6 +17,8 @@
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-a63367c.url = "github:nixos/nixpkgs/a63367cfcdb886bee208f50db8b069f61158861d";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
dotfiles = {
url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git";
@ -43,7 +45,7 @@
in {
packages =
forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
overlays = import ./overlays {inherit inputs;};
overlays = import ./overlays {inherit inputs outputs;};
homeManagerModules = import ./modules/home-manager;
nixosConfigurations = {
m3-kratos = nixpkgs.lib.nixosSystem {

2
home/common/default.nix
View File

@ -15,6 +15,8 @@
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
outputs.overlays.pinned-packages
outputs.overlays.master-packages
# You can also add overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default

2
home/features/cli/default.nix
View File

@ -74,7 +74,7 @@
unimatrix
unzip
wttrbar
yazi
#yazi
zellij-ps
zip
];

3
home/features/cli/fish.nix
View File

@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
@ -29,7 +28,7 @@ in {
--header 'Press CTRL-Y to copy command into clipboard'"
set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden
set -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
set -x FLAKE $HOME/m3-kratos
set -x FLAKE $HOME/p/nixos/nixos-config
if test (tty) = "/dev/tty1"
exec Hyprland &> /dev/null

2
home/features/desktop/coding.nix
View File

@ -1,3 +1,3 @@
{pkgs, ...}: {
home.packages = with pkgs; [bruno zed-editor];
home.packages = with pkgs; [pinned.bruno zed-editor];
}

5
home/features/desktop/media.nix
View File

@ -27,8 +27,8 @@ in {
pavucontrol
qpwgraph
v4l-utils
# plexamp
# spotify
plexamp
spotify
# uxplay
# vlc
# webcord
@ -41,7 +41,6 @@ in {
plugins = with pkgs.obs-studio-plugins; [
input-overlay
obs-gstreamer
obs-vertical-canvas
obs-vaapi
obs-vkcapture
wlrobs

1
home/m3tam3re/m3-kratos.nix
View File

@ -1,6 +1,5 @@
{
config,
pkgs,
lib,
...
}:

6
hosts/common/default.nix
View File

@ -1,6 +1,5 @@
# Common configuration for all hosts
{
config,
pkgs,
lib,
inputs,
@ -24,6 +23,8 @@
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
outputs.overlays.pinned-packages
outputs.overlays.master-packages
# You can also add overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
@ -45,6 +46,8 @@
nix = {
settings = {
experimental-features = "nix-command flakes";
cores = 2;
max-jobs = 8;
trusted-users = [
"root"
"m3tam3re"
@ -52,6 +55,7 @@
};
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
};
optimise.automatic = true;

4
hosts/m3-kratos/configuration.nix
View File

@ -55,10 +55,6 @@
# Enable sound.
# hardware.pulseaudio.enable = true;
# OR
services.pipewire = {
enable = true;
pulse.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.libinput.enable = true;

2
hosts/m3-kratos/programs.nix
View File

@ -28,6 +28,6 @@
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/home/m3tam3re/m3-kratos";
flake = "/home/m3tam3re/p/nixos/nixos-config";
};
}

15
overlays/default.nix
View File

@ -7,6 +7,7 @@
# https://nixos.wiki/wiki/Overlays
modifications = final: prev: {
n8n = import ./mods/n8n.nix {inherit prev;};
ffmpeg = inputs.nixpkgs-stable.legacyPackages.${prev.system}.ffmpeg;
};
stable-packages = final: _prev: {
@ -15,4 +16,18 @@
config.allowUnfree = true;
};
};
pinned-packages = final: _prev: {
pinned = import inputs.nixpkgs-a63367c {
system = final.system;
config.allowUnfree = true;
};
};
master-packages = final: _prev: {
master = import inputs.nixpkgs-master {
system = final.system;
config.allowUnfree = true;
};
};
}

2
overlays/mods/n8n.nix
View File

@ -12,6 +12,6 @@ prev.n8n.overrideAttrs (oldAttrs: rec {
pnpmDeps = prev.pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-FsBA/QENfreCJnYCw8MnX5W2D+WJ3DUuTIakH78TYU8=";
hash = "sha256-jJc1qcyR5ERYvIou3c7KeRhe8KL00fk2vLIxn538hOE=";
};
})