veneficium/sys-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse source
This commit is contained in:
Veneficium 2025-03-14 19:44:32 +01:00
commit bd05021b0b
12 changed files with 108 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -301,11 +301,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738753876, "lastModified": 1739298825,
"narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", "narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", "rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +326,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1738756893, "lastModified": 1739296148,
"narHash": "sha256-8i0bwUAomkug0nTNkyzpVctC78FYCUWUg3kOtXVeR/c=", "narHash": "sha256-q00GM94Rr4Sgh/phpJucXonWkL9C9zX/8pFXstZKJcY=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "1b2c644b287066aa161734a727f3f6f5da9b4d5c", "rev": "dc9e2366279f9c4f8586963e0aab3c0a4ebd9133",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +359,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1738751713, "lastModified": 1739287457,
"narHash": "sha256-DxucZaCzH72v4SSUC6eK1TNLQVxBwXr1nYMsABoJ6ls=", "narHash": "sha256-0xpNX8oVKJSKglhfrxQxMhA5UWOu2OAUwNvxNuDmOI8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "900da597e4d3d09ad4c4ddc3ba2abf58c4886ec9", "rev": "213eafa2032897e7ce3132f179a135a65d327d9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738720055, "lastModified": 1739238493,
"narHash": "sha256-EM3qXpBkIP5Pt4NgmaKlI+QHPZRfLbYl/Lym4muHWUY=", "narHash": "sha256-rk89UVGqLwts2c05TMpigB+zL2mhIYn33YUC69v7dxk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "c30f3cd8a3256cb7916af31aa3625759ebb05ace", "rev": "eca81883cfad1f52a52d09025d10f5907200ea06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +396,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1739020877,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d", "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +412,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1738702386, "lastModified": 1739206421,
"narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", "rev": "44534bc021b85c8d78e465021e21f33b856e2540",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -461,11 +461,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1738611626, "lastModified": 1739215427,
"narHash": "sha256-IgjqlYPaS8Bg+jc6a691w27XDFhBeM7gkP4eDcR2EBs=", "narHash": "sha256-1yIsiPwwxXal7+wkWogjPhsM5BjRlK61lAHQtlX8s04=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "d513f59da5856978c363d2f82103f708f4a6024d", "rev": "4af2686c1c62176d0ce28c4d55e813ae5ed52b6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +577,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738680491, "lastModified": 1738953846,
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -610,11 +610,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737837494, "lastModified": 1739246919,
"narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
hosts/main-laptop/configuration.nix
View file

@ -19,7 +19,6 @@
systemd.services.NetworkManager-wait-online.enable = false; systemd.services.NetworkManager-wait-online.enable = false;
virtualisation.virtualbox.host.enable = true;
users.extraGroups.vboxusers.members = [ "fedfer" ]; users.extraGroups.vboxusers.members = [ "fedfer" ];
stylix.enable = true; stylix.enable = true;

26
hosts/main-laptop/home.nix
View file

@ -1,6 +1,5 @@
{ {
lib, lib,
inputs,
pkgs, pkgs,
... ...
}: }:
@ -17,9 +16,9 @@
programs = { programs = {
firefox.enable = lib.mkForce true; firefox.enable = lib.mkForce true;
amberol.enable = lib.mkForce true; amberol.enable = lib.mkForce true;
wezterm.enable = lib.mkForce true;
vscodium.enable = lib.mkForce true; vscodium.enable = lib.mkForce true;
kitty.enable = lib.mkForce true; kitty.enable = lib.mkForce true;
ghostty.enable = true;
starship.enable = lib.mkForce true; starship.enable = lib.mkForce true;
helix.enable = lib.mkForce true; helix.enable = lib.mkForce true;
@ -32,19 +31,6 @@
services.mpris-proxy.enable = true; services.mpris-proxy.enable = true;
programs.gnome-shell = {
enable = true;
extensions = [
{ package = pkgs.gnomeExtensions.valent; }
{ package = pkgs.gnomeExtensions.blur-my-shell; }
{ package = pkgs.gnomeExtensions.dash-to-dock; }
{ package = pkgs.gnomeExtensions.tray-icons-reloaded; }
{ package = pkgs.gnomeExtensions.native-window-placement; }
{ package = pkgs.gnomeExtensions.system-monitor; }
{ package = pkgs.gnomeExtensions.highlight-focus; }
];
};
stylix = { stylix = {
enable = true; enable = true;
autoEnable = true; autoEnable = true;
@ -79,8 +65,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
prismlauncher prismlauncher
foliate foliate
biome
python3
impression impression
chatterino2 chatterino2
qbittorrent qbittorrent
@ -88,7 +72,6 @@
nixpkgs-fmt nixpkgs-fmt
nixfmt-rfc-style nixfmt-rfc-style
powertop powertop
git-credential-manager
vesktop vesktop
libreoffice libreoffice
valent valent
@ -100,8 +83,11 @@
celluloid celluloid
fractal fractal
yazi yazi
# logseq requires electron 27 which is EOL therefore temp disable until upstream pkg updates nautilus
#logseq tuba
eza
bat
gitui
]; ];
home.stateVersion = "23.11"; # DO NOT CHANGE home.stateVersion = "23.11"; # DO NOT CHANGE

14
modules/home/cliPrograms/bat.nix Normal file
View file

@ -0,0 +1,14 @@
{ config, lib, ... }:
{
options.setting.programs.bat = {
enable = lib.mkEnableOption "enable bat, cat replacement";
};
config = lib.mkIf config.settings.programs.bat {
programs.bat.enable = true;
programs.fish.shellAliases = lib.mkIf config.settings.shell.fish.enable {
"cat" = "bat";
};
};
}

4
modules/home/default.nix
View file

@ -10,6 +10,7 @@
./cliPrograms/pass.nix ./cliPrograms/pass.nix
./cliPrograms/hyfetch.nix ./cliPrograms/hyfetch.nix
./cliPrograms/git.nix ./cliPrograms/git.nix
./cliPrograms/bat.nix
./cliPrograms/starship ./cliPrograms/starship
./cliPrograms/fastfetch ./cliPrograms/fastfetch
@ -23,6 +24,7 @@
./desktopPrograms/wezterm ./desktopPrograms/wezterm
./desktopPrograms/vscodium ./desktopPrograms/vscodium
./desktopPrograms/kitty ./desktopPrograms/kitty
./desktopPrograms/ghostty
]; ];
settings = { settings = {
@ -40,10 +42,12 @@
vscodium.enable = lib.mkDefault false; vscodium.enable = lib.mkDefault false;
zed.enable = lib.mkDefault false; zed.enable = lib.mkDefault false;
kitty.enable = lib.mkDefault false; kitty.enable = lib.mkDefault false;
ghostty.enable = lib.mkDefault false;
pass.enable = lib.mkDefault true; pass.enable = lib.mkDefault true;
fastfetch.enable = lib.mkDefault true; fastfetch.enable = lib.mkDefault true;
git.enable = lib.mkDefault true; git.enable = lib.mkDefault true;
bat.enable = lib.mkDefault true;
hyfetch.enable = lib.mkDefault false; hyfetch.enable = lib.mkDefault false;
starship.enable = lib.mkDefault false; starship.enable = lib.mkDefault false;
helix.enable = lib.mkDefault false; helix.enable = lib.mkDefault false;

14
modules/home/desktopPrograms/ghostty/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ config, lib, ... }:
{
options.settings.programs.ghostty = {
enable = lib.mkEnableOption "enable ghostty terminal emulator";
};
config = lib.mkIf config.settings.programs.ghostty.enable {
programs.ghostty = {
enable = true;
enableFishIntegration = true;
installBatSyntax = true;
};
};
}

1
modules/home/desktopPrograms/vscodium/default.nix
View file

@ -36,7 +36,6 @@
]) ])
(with pkgs.open-vsx; [ (with pkgs.open-vsx; [
jeanp413.open-remote-ssh jeanp413.open-remote-ssh
antfu.unocss
bierner.markdown-preview-github-styles bierner.markdown-preview-github-styles
sumneko.lua sumneko.lua
]) ])

14
modules/home/desktopPrograms/vscodium/settings.json
View file

@ -5,21 +5,23 @@
"workbench.productIconTheme": "material-product-icons", "workbench.productIconTheme": "material-product-icons",
"editor.fontLigatures": true, "editor.fontLigatures": true,
"terminal.integrated.fontLigatures": true, "terminal.integrated.fontLigatures": true,
"workbench.sideBar.location": "right", "workbench.sideBar.location": "right",
"workbench.startupEditor": "welcomePageInEmptyWorkbench", "workbench.startupEditor": "welcomePageInEmptyWorkbench",
"editor.formatOnSave": true, "editor.formatOnSave": true,
"C_Cpp.clang_format_fallbackStyle": "LLVM", "C_Cpp.clang_format_fallbackStyle": "LLVM",
"nix.enableLanguageServer": true, "nix.enableLanguageServer": true,
"nix.serverPath": "nixd", "nix.serverPath": "nixd",
"nix.formatterPath": [
"nix",
"fmt",
"--",
"--"
],
"nix.serverSettings": { "nix.serverSettings": {
"nixd": { "nixd": {
"formatting": {
"command": ["nixfmt"]
},
"options": { "options": {
"home-manager": { "home-manager": {
"expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options" "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options.home-manager.users.type.getSubOptions []"
}, },
"nixos": { "nixos": {
"expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options" "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options"
@ -27,4 +29,4 @@
} }
} }
} }
} }

4
modules/home/niri/config.kdl
View file

@ -148,6 +148,10 @@ window-rule {
clip-to-geometry true clip-to-geometry true
} }
hotkey-overlay {
skip-at-startup
}
binds { binds {
Mod+Shift+Backslash { show-hotkey-overlay; } Mod+Shift+Backslash { show-hotkey-overlay; }

36
modules/home/niri/waybar.json
View file

@ -2,9 +2,22 @@
"layer": "top", "layer": "top",
"position": "top", "position": "top",
"spacing": 10, "spacing": 10,
"modules-left": ["niri/workspaces"], "modules-left": [
"modules-center": ["clock#1", "clock#2", "clock#3"], "niri/workspaces"
"modules-right": ["pulseaudio", "memory", "cpu", "battery", "disk", "tray"], ],
"modules-center": [
"clock#1",
"clock#2",
"clock#3"
],
"modules-right": [
"pulseaudio",
"memory",
"cpu",
"battery",
"disk",
"tray"
],
"sway/workspaces": { "sway/workspaces": {
"disable-scroll": true, "disable-scroll": true,
"format": "{name}" "format": "{name}"
@ -27,7 +40,10 @@
"format-muted": "", "format-muted": "",
"format-icons": { "format-icons": {
"headphones": "", "headphones": "",
"default": ["", ""] "default": [
"",
""
]
}, },
"scroll-step": 5, "scroll-step": 5,
"on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
@ -44,12 +60,18 @@
}, },
"battery": { "battery": {
"states": { "states": {
"good": 95, "good": 50,
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format": "{icon} {capacity}%", "format": "{icon} {capacity}%",
"format-icons": ["", "", "", "", ""] "format-icons": [
"",
"",
"",
"",
""
]
}, },
"disk": { "disk": {
"interval": 5, "interval": 5,
@ -60,4 +82,4 @@
"icon-size": 22, "icon-size": 22,
"spacing": 6 "spacing": 6
} }
} }

2
modules/nixos/programs/niri.nix
View file

@ -16,6 +16,8 @@
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
gtk.iconCache.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
swayosd swayosd
fuzzel fuzzel

2
modules/nixos/services/caddy.nix
View file

@ -11,7 +11,5 @@
config = lib.mkIf config.settings.services.caddy.enable { config = lib.mkIf config.settings.services.caddy.enable {
services.caddy.enable = true; services.caddy.enable = true;
environment.systemPackages = [ pkgs.caddy ];
#services.caddy.setting = { };
}; };
} }