1 Commits

Author SHA1 Message Date
Armel van Ravels
5c0357c933 Use different resolution at work 2026-04-28 09:11:27 +02:00
24 changed files with 162 additions and 355 deletions

View File

@@ -10,7 +10,6 @@ Each system has its own dedicated configuration module.
| **gandalf** | Personal system configuration for `gandalf`. |
| **frodo** | Personal system configuration for `frodo`. |
| **legolas** | Personal system configuration for `legolas`. |
| **balrog** | Personal system configuration for `balrog`. |
| **work** | Work-oriented system configuration for `work`. |
@@ -19,7 +18,7 @@ Each system has its own dedicated configuration module.
To rebuild and switch to a specific system:
```bash
# Replace <system> with gandalf, frodo, legolas, balrog or work
# Replace <system> with gandalf, frodo, legolas, or work
sudo nixos-rebuild switch --flake .#<system>
```

38
flake.lock generated
View File

@@ -7,58 +7,43 @@
]
},
"locked": {
"lastModified": 1781319724,
"narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
"lastModified": 1775425411,
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-26.05",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
"lastModified": 1780908363,
"narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
"type": "github"
},
"original": {
"owner": "gmodena",
"repo": "nix-flatpak",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"lastModified": 1776734388,
"narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-26.05",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1781359544,
"narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
"lastModified": 1776329215,
"narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
"rev": "b86751bc4085f48661017fa226dee99fab6c651b",
"type": "github"
},
"original": {
@@ -71,7 +56,6 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}

View File

@@ -3,7 +3,7 @@
inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs/nixos-26.05";
url = "github:nixos/nixpkgs/nixos-25.11";
};
nixpkgs-unstable = {
@@ -11,12 +11,7 @@
};
home-manager = {
url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-flatpak = {
url = "github:gmodena/nix-flatpak";
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};

View File

@@ -1,4 +1,4 @@
{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
{ nixpkgs, nixpkgs-unstable, home-manager, ... }:
let
mkPkgsUnstable = system: import nixpkgs-unstable {
@@ -13,10 +13,8 @@ in
system = "x86_64-linux";
specialArgs = {
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
nixFlatpak = nix-flatpak;
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
./systems/gandalf
];
@@ -25,10 +23,8 @@ in
system = "x86_64-linux";
specialArgs = {
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
nixFlatpak = nix-flatpak;
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
./systems/frodo
];
@@ -37,34 +33,18 @@ in
system = "x86_64-linux";
specialArgs = {
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
nixFlatpak = nix-flatpak;
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
./systems/legolas
];
};
"balrog" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
nixFlatpak = nix-flatpak;
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
./systems/balrog
];
};
"work" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
nixFlatpak = nix-flatpak;
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
./systems/work
];

View File

@@ -1,57 +0,0 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
../modules/home-manager.nix
../modules/common.nix
../modules/users.nix
../modules/locales.nix
../modules/services.nix
../modules/programs.nix
../modules/docker.nix
../modules/printing.nix
../modules/bambu-studio-flatpak.nix
../modules/arduino-ide.nix
../modules/devenv.nix
# ../modules/bitwarden.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = false;
boot.loader = {
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
};
grub = {
efiSupport = true;
device = "nodev";
};
};
networking.hostName = "balrog";
networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
hardware.enableAllFirmware = true;
boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
boot.extraModulePackages = with config.boot.kernelPackages; [
broadcom_sta
];
nixpkgs.config = {
allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"];
};
hardware.bluetooth.enable = true;
services.blueman.enable = true;
system.stateVersion = "25.11"; # Did you read the comment?
}

View File

@@ -1,31 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A202-E19C";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@@ -23,20 +23,15 @@
../modules/qbittorrent.nix
../modules/gimp.nix
../modules/openscad.nix
../modules/bambu-studio-flatpak.nix
../modules/arduino-ide.nix
../modules/bitwarden.nix
../modules/flatpak.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "gandalf";
networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
networking.firewall.enable = false;
home-manager.users.avravels.home.hyprland.execOnce = [
"waybar"

View File

@@ -1,8 +0,0 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
arduino-ide
];
}

View File

@@ -1,8 +0,0 @@
{ pkgs, ...}:
{
services.flatpak.enable = true;
services.flatpak.packages = [
"com.bambulab.BambuStudio"
];
}

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }:
{ config, pkgs, ... } :
{
environment.systemPackages = with pkgs; [
btop
bambu-studio
];
}

View File

@@ -1,12 +0,0 @@
{ config, pkgs, ... }:
{
nixpkgs.config.permittedInsecurePackages = [
"electron-39.8.10"
];
environment.systemPackages = with pkgs; [
bitwarden-desktop
];
}

View File

@@ -1,10 +0,0 @@
{ config, pkgsUnstable, ... } :
{
environment.systemPackages = with pkgsUnstable; [
devenv
];
nix.settings.trusted-users = [ "root" "avravels" ];
}

View File

@@ -0,0 +1,5 @@
{ pkgs, ...}:
{
services.flatpak.enable = true;
}

View File

@@ -9,7 +9,7 @@
imports = [
./other/fonts.nix
# ./programs/bitwarden.nix
./programs/bitwarden.nix
./programs/kitty.nix
./programs/zsh.nix
./programs/direnv.nix

View File

@@ -1,9 +1,9 @@
{ pkgs, config, ... }:
{ pkgs, ... }:
{
programs.firefox = {
enable = true;
configPath = "${config.xdg.configHome}/mozilla/firefox";
profiles.default = {
settings = {
"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";

View File

@@ -1,4 +1,4 @@
{ lib, pkgsUnstable, config, ... }:
{ lib, pkgs, config, ... }:
{
options.home.git = {
@@ -18,7 +18,6 @@
config = {
programs.git = {
enable = true;
package = pkgsUnstable.git;
settings.user = {
name = config.home.git.userName;
email = config.home.git.userEmail;

View File

@@ -3,8 +3,6 @@
{
programs.neovim = {
enable = true;
withRuby = false;
withPython3 = false;
defaultEditor = true;
extraLuaPackages = ps: [ ps.magick ];
extraPackages = [
@@ -29,7 +27,7 @@
image-nvim
];
initLua = ''
extraLuaConfig = ''
vim.cmd("colorscheme catppuccin-mocha")
-- Basic settings
vim.o.number = true

View File

@@ -1,8 +1,5 @@
{ pkgs, ... }:
{
programs.tmux = {
enable = true;
mouse = true;
};
programs.tmux.enable = true;
}

View File

@@ -1,24 +1,22 @@
{ pkgs, pkgsUnstable, ... }:
{ pkgs, ... }:
{
programs.vscode = {
enable = true;
package = pkgsUnstable.vscode.fhs;
package = pkgs.vscode.fhs;
profiles.default.extensions = with pkgs.vscode-extensions; [
ms-dotnettools.csharp
ms-dotnettools.csdevkit
ms-dotnettools.vscode-dotnet-runtime
mkhl.direnv # Direnv integration for VSCode
catppuccin.catppuccin-vsc
bmewburn.vscode-intelephense-client
continue.continue
vscodevim.vim
];
profiles.default.userSettings = {
"editor.lineNumbers" = "relative";
"workbench.colorTheme" = "Catppuccin Mocha";
"workbench.editor.enablePreview" = false;
"direnv.restart.automatic" = true;
"terminal.integrated.defaultProfile.linux" = "zsh";
"terminal.integrated.profiles.linux" = {

View File

@@ -15,7 +15,6 @@
name = "Adwaita";
package = pkgs.adwaita-icon-theme;
};
gtk4.theme = null;
};
home.sessionVariables = {

View File

@@ -23,145 +23,132 @@ in
wayland.windowManager.hyprland = {
enable = true;
configType = "lua";
settings =
let
mkLuaInline = lib.generators.mkLuaInline;
toLua = lib.generators.toLua;
mkArgs = args: { _args = args; };
bind =
keys: dispatcher: options:
mkArgs [
keys
dispatcher
options
];
dsp = {
exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
window = {
move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
drag = mkLuaInline "hl.dsp.window.drag()";
resize = mkLuaInline "hl.dsp.window.resize()";
close = mkLuaInline "hl.dsp.window.close()";
kill = mkLuaInline "hl.dsp.window.kill()";
fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
};
exit = mkLuaInline "hl.dsp.exit()";
workspace = {
move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
};
};
mod = "SUPER";
workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
in
{
config = {
general = {
resize_on_border = true;
allow_tearing = true;
};
animations.enabled = true;
decoration = {
inactive_opacity = 0.8;
active_opacity = 0.9;
rounding = 5;
rounding_power = 2.5;
blur = {
enabled = true;
brightness = 1.0;
contrast = 1.0;
noise = 0.01;
vibrancy = 0.2;
vibrancy_darkness = 0.5;
passes = 4;
size = 7;
popups = true;
popups_ignorealpha = 0.2;
};
shadow = {
enabled = true;
color = "rgba(00000055)";
offset = "0 15";
range = 100;
render_power = 2;
scale = 0.97;
};
};
misc = {
focus_on_activate = true;
};
};
bind = lib.flatten [
(bind "${mod} + Q" (dsp.window.kill) { })
(bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
(bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
(bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
(bind "${mod} + F" (dsp.window.fullscreen) { })
(bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
(bind "${mod} + M" (dsp.exit) { })
(bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
(bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
(bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
(bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
(bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
(bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
(bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
(bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
(bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
(bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
(bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
(bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
(bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
(bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
(bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
(bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
(bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
(bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
(bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
(bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
(bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
(bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
(bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
(bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
(bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
(bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
(bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
(bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
(bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
repeating = true;
locked = true;
})
(bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
repeating = true;
locked = true;
})
(bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
(bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
(bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
(bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
(bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
settings = {
### MONITOR
monitor = [
"DP-3,1920x1080,auto,1"
",preferred,auto,1"
];
on = mkArgs [
"hyprland.start"
(mkLuaInline ''
function()
hl.exec_cmd("waybar")
end'')
### VARIABLES
"$mod" = "SUPER";
"$terminal" = "kitty";
"$menu" = "rofi -show drun";
"$bluetoothMenu" = "bzmenu --launcher rofi";
"$files" = "rofi -show filebrowser";
### BASIC LAYOUT
general = {
layout = "dwindle";
resize_on_border = true;
};
decoration = {
inactive_opacity = 0.8;
active_opacity = 0.9;
rounding = 5;
rounding_power = 2.5;
blur = {
enabled = true;
brightness = 1.0;
contrast = 1.0;
noise = 0.01;
vibrancy = 0.2;
vibrancy_darkness = 0.5;
passes = 4;
size = 7;
popups = true;
popups_ignorealpha = 0.2;
};
shadow = {
enabled = true;
color = "rgba(00000055)";
ignore_window = true;
offset = "0 15";
range = 100;
render_power = 2;
scale = 0.97;
};
};
# Use the configurable option here (default `[ "waybar" ]`)
exec-once = (if cfg == null then { execOnce = [ "waybar" ]; } else cfg).execOnce;
### INPUT
input = {
kb_layout = "us";
};
### KEYBINDINGS
bind = [
# Apps
"$mod, RETURN, exec, $terminal"
"$mod, D, exec, $menu"
"$mod, B, exec, $bluetoothMenu"
"$mod, G, exec, $files"
"$mod, Q, killactive"
"$mod, F, fullscreen"
"$mod, M, exit"
"$mod, L, exec, hyprlock"
# show/hide waybar
"$mod, W, exec, pkill -SIGUSR1 -f '^waybar$'"
# Focus
"$mod, LEFT, movefocus, l"
"$mod, RIGHT, movefocus, r"
"$mod, UP, movefocus, u"
"$mod, DOWN, movefocus, d"
# Workspaces
"$mod, 1, workspace, 1"
"$mod, 2, workspace, 2"
"$mod, 3, workspace, 3"
"$mod, 4, workspace, 4"
"$mod, 5, workspace, 5"
"$mod, 6, workspace, 6"
"$mod, 7, workspace, 7"
"$mod, 8, workspace, 8"
"$mod, 9, workspace, 9"
"$mod SHIFT, 1, movetoworkspace, 1"
"$mod SHIFT, 2, movetoworkspace, 2"
"$mod SHIFT, 3, movetoworkspace, 3"
"$mod SHIFT, 4, movetoworkspace, 4"
"$mod SHIFT, 5, movetoworkspace, 5"
"$mod SHIFT, 6, movetoworkspace, 6"
"$mod SHIFT, 7, movetoworkspace, 7"
"$mod SHIFT, 8, movetoworkspace, 8"
"$mod SHIFT, 9, movetoworkspace, 9"
# Window movement
"$mod SHIFT, LEFT, movewindow, l"
"$mod SHIFT, RIGHT, movewindow, r"
"$mod SHIFT, UP, movewindow, u"
"$mod SHIFT, DOWN, movewindow, d"
# Hyprshot
"$mod, Z, exec, hyprshot -m region"
# Media keys
", XF86AudioPlay, exec, playerctl play-pause"
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
", XF86AudioNext, exec, playerctl next"
", XF86AudioPrev, exec, playerctl previous"
", XF86Calculator, exec, speedcrunch"
];
bindm = [
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
];
};
};

View File

@@ -1,8 +1,10 @@
{ pkgsUnstable, ... }:
{ pkgs, ... }:
{
services.ollama = {
enable = true;
package = pkgsUnstable.ollama-cuda;
package = pkgs.ollama-cuda;
};
services.open-webui.enable = true;
}

View File

@@ -5,12 +5,12 @@
initialPassword = "welcome";
isNormalUser = true;
description = "Armel van Ravels";
extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
packages = with pkgs; [
home-manager
legcord
spotify
proton-vpn
protonvpn-gui
];
shell = pkgs.zsh;
};

View File

@@ -22,13 +22,8 @@
../modules/gimp.nix
../modules/jq.nix
../modules/enova.nix
../modules/devenv.nix
../modules/bitwarden.nix
../modules/btop.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@@ -37,6 +32,7 @@
boot.initrd.systemd.enable = true;
programs.nix-ld.enable = true;
networking.hostName = "laptop-armel";
home-manager.users.avravels.home.hyprland.execOnce = [