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

up and running again

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-05-22 22:49:45 -04:00
parent 16696e66cd
commit 903488fa21
9 changed files with 76 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -88,11 +88,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1747880714, "lastModified": 1747931129,
"narHash": "sha256-djK1m31NlLOchzyf+j6EYOHkQH0nvlvcXZ9hWBa8B68=", "narHash": "sha256-kiZHNTbdMRdKFZlBcx1PI5hBu8Hounl/JQdueAoufqM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "783e12a65f2284fbaf88a77f50c167a28a7d9e1c", "rev": "67fa10fdfd0e958dceb60ce893956aad1ed6bce4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,11 +376,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747875884, "lastModified": 1747955385,
"narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", "narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", "rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -785,11 +785,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1747913006, "lastModified": 1747929338,
"narHash": "sha256-MaZsLpgOCpegUmUsscX02TepD/X9+onKuO+GMkXX3Pk=", "narHash": "sha256-qGMrtBvWWKPElGpQ4ZPZVGN8HLC+laJHkwcsJB7wwGs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "8d904a38ca615be076fb86b9940972018edca932", "rev": "5b5c0cc698a19c5a10ef1aee487cae238a4aac1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -818,11 +818,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747903029, "lastModified": 1747926317,
"narHash": "sha256-Xv4j93I3hTe0kWdEKKXwLALmHEf1OjHF0qO7Wy4nhE0=", "narHash": "sha256-EBGfaeZ53SNBtsB8dnvBWfjwp+dRDCEkfYyRfwTdbls=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "357f9157cc63e846a6d8097051a6dce6392d27c9", "rev": "8347cc20dc87049b398ab655565d468c5c4427a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1659,11 +1659,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747923575, "lastModified": 1747952334,
"narHash": "sha256-/2wm2FazQZ73pJSkT9OqvsdRu3KSUlxFlq6JCH0hP9A=", "narHash": "sha256-3vviUKy/BmqdVtvPHsVXDxmeb7zI3AL41MFx8yqk4+s=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "04ac1a62f9374f13e851ffe97e7acd803014c05f", "rev": "d621ed2616531c072f7b29ea93ef39cbc46bc79c",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -177,6 +177,7 @@
inherit system; inherit system;
specialArgs = configArgs; specialArgs = configArgs;
modules = [ modules = [
inputs.disko.nixosModules.disko
inputs.musnix.nixosModules.musnix inputs.musnix.nixosModules.musnix
inputs.niri.nixosModules.niri inputs.niri.nixosModules.niri
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops

45
homes/emenel/default.nix
View file

@ -1,4 +1,7 @@
{ nix-config, config, lib, pkgs, inputs, ... }: { nix-config, config, lib, pkgs, inputs, ... }:
let
scpath = "/home/emenel/.config/sops-nix/secrets";
in
{ {
imports = with nix-config.homeModules; [ imports = with nix-config.homeModules; [
@ -51,8 +54,8 @@
WINEFSYNC = 1; WINEFSYNC = 1;
PKG_CONFIG_PATH = "/home/emenel/.nix-profile/lib/pkgconfig:/home/emenel/.nix-profile/lib64/pkgconfig:/home/emenal/.nix-profile/share/pkgconfig"; PKG_CONFIG_PATH = "/home/emenel/.nix-profile/lib/pkgconfig:/home/emenel/.nix-profile/lib64/pkgconfig:/home/emenal/.nix-profile/share/pkgconfig";
GI_TYPELIB_PATH = "/run/current-system/sw/lib/girepository-1.0"; GI_TYPELIB_PATH = "/run/current-system/sw/lib/girepository-1.0";
BW_CLIENTID = "$(cat ${config.sops.defaultSymlinkPath}/bw_client_id)"; BW_CLIENTID = "$(cat ${config.sops.secrets.bw_client_id.path}/bw_client_id)";
BW_CLIENTSECRET = "$(cat ${config.sops.defaultSymlinkPath}/bw_api_key)"; BW_CLIENTSECRET = "$(cat ${config.sops.secrets.bw_api_key.path}/bw_api_key)";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
GSK_RENDERER = "ngl"; GSK_RENDERER = "ngl";
MOZ_ENABLE_WAYLAND = 1; MOZ_ENABLE_WAYLAND = 1;
@ -70,18 +73,10 @@
defaultSopsFile = ./secrets.yaml; defaultSopsFile = ./secrets.yaml;
secrets = { secrets = {
bw_client_id = { bw_client_id = {};
path = "${config.sops.defaultSymlinkPath}/bw_client_id"; bw_api_key = {};
}; ssh_key = {};
bw_api_key = { borg_url = {};
path = "${config.sops.defaultSymlinkPath}/bw_api_key";
};
ssh_key = {
path = "${config.sops.defaultSymlinkPath}/ssh_key";
};
borg_url = {
path = "${config.sops.defaultSymlinkPath}/borg_url";
};
icloud = {}; icloud = {};
}; };
}; };
@ -106,9 +101,7 @@
"- home/emenel/.cache" "- home/emenel/.cache"
"- home/emenel/.nix*" "- home/emenel/.nix*"
"- home/emenel/.steam*" "- home/emenel/.steam*"
"- home/emenel/Dropbox"
"- home/emenel/Sync" "- home/emenel/Sync"
"- home/emenel/.dropbox*"
"- home/emenel/.BitwigStudio" "- home/emenel/.BitwigStudio"
"- home/emenel/.local/share/bitwig" "- home/emenel/.local/share/bitwig"
]; ];
@ -159,14 +152,18 @@
}; };
}; };
# email signature systemd.user.tmpfiles.rules = [
home.file.".signature".source = ./dotfiles/dot_signature; "L /home/emenel/Mounts - - - - /mnt"
];
#custom script executables home = {
home.file.".local/bin" = { file = {
source = ./dotfiles/dot_local/bin; ".signature".source = ./dotfiles/dot_signature;
recursive = true; ".local/bin" = {
source = ./dotfiles/dot_local/bin;
recursive = true;
};
".ssh/config".source = ./dotfiles/dot_ssh/config;
};
}; };
home.file.".ssh/config".source = ./dotfiles/dot_ssh/config;
} }

10
hosts/eddie/configuration.nix
View file

@ -4,19 +4,16 @@
imports = with nix-config.nixosModules; [ imports = with nix-config.nixosModules; [
./hardware-configuration.nix ./hardware-configuration.nix
./disko-config.nix
./fs-default.nix
# ./disko-config.nix
./razer-speaker-fix.nix ./razer-speaker-fix.nix
btrfs-conf
users-emenel users-emenel
nixld nixld
niri niri
kanata kanata
filesystems-filez filesystems-filez
filesystems-media-server
sound sound
]; ];
@ -282,10 +279,11 @@
services.fstrim.enable = true; services.fstrim.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
# programs.devmon.enable = true;
services.rpcbind.enable = true; # needed for NFS services.rpcbind.enable = true; # needed for NFS
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /mnt 0770 root users" "d /mnt 0770 root users"
"L /mnt/removable - - - - /run/media/emenel"
]; ];
services.hardware.openrgb = { services.hardware.openrgb = {

2
hosts/eddie/disko-config.nix
View file

@ -21,7 +21,7 @@
size = "100%"; size = "100%";
content = { content = {
type = "luks"; type = "luks";
name = "crypted" name = "crypted";
settings = { settings = {
allowDiscards = true; allowDiscards = true;
}; };

1
modules/home/desktop.nix
View file

@ -226,6 +226,7 @@
enable = true; enable = true;
automount = true; automount = true;
tray = "always"; tray = "always";
notify = false;
}; };
}; };

31
modules/system/btrfs-conf.nix Normal file
View file

@ -0,0 +1,31 @@
{ config, lib, pkgs, ... }:
{
services = {
btrfs = {
autoScrub = {
enable = true;
};
};
btrbk = {
instances."home" = {
onCalendar = "hourly";
settings = {
timestamp_format = "long";
snapshot_preserve_min = "18h";
snapshot_preserve = "48h";
volume = {
"/" = {
snapshot_dir = "/.snapshots";
subvolume = "/home";
};
};
};
};
};
};
systemd.tmpfiles.rules = [
"d /.snapshots 0755 root root"
];
}

2
packages/mioctl.nix
View file

@ -6,7 +6,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://codeberg.org/pmatilai/mioctl/archive/master.zip"; url = "https://codeberg.org/pmatilai/mioctl/archive/master.zip";
sha256 = "sha256-GFCUqao+LC9SgparV1699D72wnD0kZeroyq5DRxdJos="; sha256 = "sha256-duWFdF+gjExhDxUKdCEOx1hwkA4O2YROVtJLzGAYjdA=";
}; };
nativeBuildInputs = [ makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip ];

2
packages/rmpc-latest.nix
View file

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
owner = "mierak"; owner = "mierak";
repo = "rmpc"; repo = "rmpc";
rev = "master"; rev = "master";
hash = "sha256-TwJKoLcJlqRtBs3lV7kfT/gyOs23V4Yp4xE7zz1fFXI="; hash = "sha256-ERLOi+TyAq3Dkmk1UfTqqIdI/LqxAk7bFJfq+18Kqlw=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;