10 Commits

8 changed files with 174 additions and 191 deletions

12
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774274588, "lastModified": 1774875830,
"narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=", "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b", "rev": "7afd8cebb99e25a64a745765920e663478eb8830",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1774244481, "lastModified": 1774799055,
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4590696c8693fea477850fe379a01544293ca4e2", "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -20,7 +20,8 @@
../modules/audacity.nix ../modules/audacity.nix
../modules/ollama.nix ../modules/ollama.nix
../modules/wireguard.nix ../modules/wireguard.nix
../modules/rdp.nix ../modules/qbittorrent.nix
../modules/gimp.nix
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@@ -30,6 +31,13 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
home-manager.users.avravels.home.hyprland.execOnce = [
"waybar"
"[workspace 1 silent] kitty tmux"
"[workspace 1 silent] spotify"
"[workspace 2 silent] firefox"
];
networking.interfaces.enp130s0.wakeOnLan.enable = true; networking.interfaces.enp130s0.wakeOnLan.enable = true;
networking.firewall.allowedUDPPorts = [ 9 ]; networking.firewall.allowedUDPPorts = [ 9 ];
@@ -51,12 +59,6 @@
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
specialisation = {
zen.configuration = {
boot.kernelPackages = pkgs.linuxPackages_zen;
};
};
services = { services = {
# Bluetooth fixes # Bluetooth fixes
# Can be removed when https://github.com/NixOS/nixpkgs/pull/499670 is merged and in 25.11 # Can be removed when https://github.com/NixOS/nixpkgs/pull/499670 is merged and in 25.11

7
systems/modules/gimp.nix Normal file
View File

@@ -0,0 +1,7 @@
{ config, pkgs, ... } :
{
environment.systemPackages = with pkgs; [
gimp
];
}

View File

@@ -1,32 +0,0 @@
{ pkgs, lib, ... }:
{
# Home Manager state version
home.stateVersion = "25.11";
home.username = "avravels";
home.homeDirectory = "/home/avravels";
imports = [
./other/fonts.nix
./programs/bitwarden.nix
./programs/kitty.nix
./programs/zsh.nix
./programs/direnv.nix
./programs/firefox.nix
./programs/tmux.nix
./programs/git-work.nix
./programs/libreoffice.nix
./programs/nvim.nix
./programs/ripgrep.nix
./programs/vscode.nix
./wm/rofi.nix
./wm/cursor.nix
./wm/dconf.nix
./wm/gtk.nix
./wm/waybar.nix
./wm/hyprland.nix
./wm/hyprpaper.nix
];
}

View File

@@ -1,6 +1,18 @@
{ pkgs, ... }: { lib, pkgs, config, ... }:
let
cfg = config.home.hyprland;
in
{ {
options.home.hyprland = {
execOnce = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ "waybar" ];
description = "Commands to run once when Hyprland starts (maps to Hyprland `exec-once`).";
};
};
config = {
home.packages = with pkgs; [ home.packages = with pkgs; [
bzmenu bzmenu
hyprshot hyprshot
@@ -63,9 +75,8 @@
}; };
}; };
exec-once = [ # Use the configurable option here (default `[ "waybar" ]`)
"waybar" exec-once = (if cfg == null then { execOnce = [ "waybar" ]; } else cfg).execOnce;
];
### INPUT ### INPUT
input = { input = {
@@ -140,4 +151,5 @@
]; ];
}; };
}; };
};
} }

View File

@@ -0,0 +1,7 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
qbittorrent
];
}

View File

@@ -1,16 +0,0 @@
{ pkgs, ... }:
{
services.xserver.desktopManager.plasma6.enable = true;
services.xrdp.enable = true;
services.xrdp.defaultWindowManager = "startplasma-x11";
services.xrdp.openFirewall = true;
programs.seahorse.enable = false;
security.polkit.extraConfig = ''
polkit.addRule(function(action, subject) {
if (action.id.indexOf("org.freedesktop.color-manager.") == 0 && subject.isInGroup("users")) {
return polkit.Result.YES;
}
});
'';
}

View File

@@ -19,6 +19,7 @@
../modules/wireguard.nix ../modules/wireguard.nix
../modules/remmina.nix ../modules/remmina.nix
../modules/postman.nix ../modules/postman.nix
../modules/gimp.nix
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@@ -32,6 +33,8 @@
networking.hostName = "laptop-armel"; networking.hostName = "laptop-armel";
home-manager.users.avravels.home.hyprland.execOnce = [ "waybar" ];
home-manager.users.avravels.home.git.userName = "Armel van Ravels"; home-manager.users.avravels.home.git.userName = "Armel van Ravels";
home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl"; home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";