18 Commits

Author SHA1 Message Date
84f149fe88 reconfigure monitors after config.reloaded event 2026-06-26 18:23:34 +02:00
Armel van Ravels
73601c9423 Add work specialization for monitor configuration 2026-06-26 14:20:24 +02:00
239f5832c6 Add btop.nix to Gandalf 2026-06-23 07:41:00 +02:00
b6059c8608 Add devenv.nix to Gandalf 2026-06-23 07:37:46 +02:00
Armel van Ravels
83210c012c Configure monitor per host 2026-06-22 11:06:20 +02:00
Armel van Ravels
0af25f781c Super + Q should close instead of kill 2026-06-22 10:24:03 +02:00
Armel van Ravels
edfb61be35 Add Vue exgtension to vscode 2026-06-22 10:10:39 +02:00
cf9c121269 Some cleanup add btop and vlc to some systems 2026-06-21 13:21:11 +02:00
f440336d5b Add VLC 2026-06-20 22:21:51 +02:00
cec7516cdf Set resolution for eDP-1 2026-06-19 19:13:58 +02:00
Armel van Ravels
cbf96db004 Add devenv nix 2026-06-19 09:02:41 +02:00
49b7373ce1 nix-fmt 2026-06-16 18:13:56 +02:00
ef0aef2178 Remove comment 2026-06-16 18:07:07 +02:00
954271b115 Fix MTP 2026-06-16 15:30:45 +02:00
Armel van Ravels
b62e9d4d52 Add keybind to hide waybar 2026-06-16 14:33:28 +02:00
Armel van Ravels
c0c85c4763 Merge branch 'feature/btop' 2026-06-15 10:25:56 +02:00
Armel van Ravels
55ed89d73b Fix resolution 2026-06-15 10:25:29 +02:00
Armel van Ravels
1dcda6d75e flake update and add btop to work machine 2026-06-15 09:55:01 +02:00
50 changed files with 938 additions and 520 deletions

10
.gitignore vendored Normal file
View File

@@ -0,0 +1,10 @@
# Devenv
.devenv*
devenv.local.nix
devenv.local.yaml
# direnv
.direnv
# pre-commit
.pre-commit-config.yaml

146
devenv.lock Normal file
View File

@@ -0,0 +1,146 @@
{
"nodes": {
"devenv": {
"locked": {
"dir": "src/modules",
"lastModified": 1781800860,
"narHash": "sha256-LrEo0eC5ckMvjpBRCuk5q5/vjItKlxnb4n/clHNRZlk=",
"owner": "cachix",
"repo": "devenv",
"rev": "d59d872d80876d9eeb3e214d3b088bc4a14a9c4f",
"type": "github"
},
"original": {
"dir": "src/modules",
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1781733627,
"narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"nixpkgs": {
"inputs": {
"nixpkgs-src": "nixpkgs-src"
},
"locked": {
"lastModified": 1781620901,
"narHash": "sha256-UF6scQlG+6lRkZBUpn/3KNavhOo5G8kDWhjVHcno8uc=",
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "2df109b343d3c68efd752e32a444a1d9b9f89afa",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "rolling",
"repo": "devenv-nixpkgs",
"type": "github"
}
},
"nixpkgs-src": {
"flake": false,
"locked": {
"lastModified": 1781454065,
"narHash": "sha256-d2xfDjnfRuf/xYGdu9VVRHiav/2w5hDL/5cw2TuVAXw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9eac87a12312b8f60dd52e1c6e1a265f6fc7f5fc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"devenv": "devenv",
"git-hooks": "git-hooks",
"nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1780220602,
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

19
devenv.nix Normal file
View File

@@ -0,0 +1,19 @@
{ pkgs
, lib
, config
, ...
}:
{
treefmt.enable = true;
treefmt.config.programs.nixpkgs-fmt.enable = true;
git-hooks = {
enable = true;
hooks = {
treefmt.enable = true;
};
};
}

11
devenv.yaml Normal file
View File

@@ -0,0 +1,11 @@
inputs:
git-hooks:
url: github:cachix/git-hooks.nix
inputs:
nixpkgs:
follows: nixpkgs
treefmt-nix:
url: github:numtide/treefmt-nix
inputs:
nixpkgs:
follows: nixpkgs

18
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781184346, "lastModified": 1781981105,
"narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=", "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ea6d221d7aa85652d014b6f719dddf036037515b", "rev": "7bfff44b465909f69a442701293bc0badcf476dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1780902259, "lastModified": 1781216227,
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -54,11 +54,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1781141223, "lastModified": 1781607440,
"narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=", "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b503dde361500433ca25a32e8f4d218bf58fb659", "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,10 +1,17 @@
{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }: { nixpkgs
, nixpkgs-unstable
, home-manager
, nix-flatpak
, ...
}:
let let
mkPkgsUnstable = system: import nixpkgs-unstable { mkPkgsUnstable =
inherit system; system:
config.allowUnfree = true; import nixpkgs-unstable {
}; inherit system;
config.allowUnfree = true;
};
in in
{ {

View File

@@ -2,25 +2,31 @@
# your system. Help is available in the configuration.nix(5) man page, 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`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: { config
, lib
, pkgs
, ...
}:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../modules/home-manager.nix ../modules/home-manager.nix
../modules/common.nix ../modules/common.nix
../modules/users.nix ../modules/users.nix
../modules/locales.nix ../modules/locales.nix
../modules/services.nix ../modules/services.nix
../modules/programs.nix ../modules/programs.nix
../modules/docker.nix ../modules/docker.nix
../modules/printing.nix ../modules/printing.nix
../modules/bambu-studio-flatpak.nix ../modules/bambu-studio-flatpak.nix
../modules/arduino-ide.nix ../modules/arduino-ide.nix
../modules/devenv.nix ../modules/devenv.nix
# ../modules/bitwarden.nix ../modules/vlc.nix
]; ../modules/btop.nix
# ../modules/bitwarden.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -31,27 +37,43 @@
efiSysMountPoint = "/boot/efi"; # ← use the same mount point here. efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
}; };
grub = { grub = {
efiSupport = true; efiSupport = true;
device = "nodev"; device = "nodev";
}; };
}; };
networking.hostName = "balrog"; networking.hostName = "balrog";
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"
];
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ]; boot.initrd.kernelModules = [ "wl" ];
boot.kernelModules = [
"wl"
"kvm-intel"
];
boot.extraModulePackages = with config.boot.kernelPackages; [ boot.extraModulePackages = with config.boot.kernelPackages; [
broadcom_sta broadcom_sta
]; ];
nixpkgs.config = { nixpkgs.config = {
allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"]; allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ "broadcom-sta" ];
}; };
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
home-manager.users.avravels.home.hyprland.monitors = [
{
output = "eDP-1";
mode = "1920x1200";
}
];
system.stateVersion = "25.11"; # Did you read the comment? system.stateVersion = "25.11"; # Did you read the comment?
} }

View File

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

View File

@@ -5,15 +5,15 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../modules/common.nix ../modules/common.nix
../modules/users.nix ../modules/users.nix
../modules/locales.nix ../modules/locales.nix
../modules/services.nix ../modules/services.nix
../modules/programs.nix ../modules/programs.nix
]; ];
# Bootloader. # Bootloader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;

View File

@@ -1,22 +1,33 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config
, lib
, pkgs
, modulesPath
, ...
}:
{ {
imports = imports = [
[ (modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"sr_mod"
"virtio_blk"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a"; device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [ ];

View File

@@ -1,32 +1,35 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ ./hardware-configuration.nix
./hardware-configuration.nix ../modules/home-manager.nix
../modules/home-manager.nix ../modules/common.nix
../modules/common.nix ../modules/users.nix
../modules/users.nix ../modules/locales.nix
../modules/locales.nix ../modules/services.nix
../modules/services.nix ../modules/programs.nix
../modules/programs.nix ../modules/gaming.nix
../modules/gaming.nix ../modules/obs-studio.nix
../modules/obs-studio.nix ../modules/garbage-collection.nix
../modules/garbage-collection.nix ../modules/printing.nix
../modules/printing.nix ../modules/docker.nix
../modules/docker.nix ../modules/matrix.nix
../modules/matrix.nix ../modules/kdenlive.nix
../modules/kdenlive.nix ../modules/audacity.nix
../modules/audacity.nix ../modules/ollama.nix
../modules/ollama.nix ../modules/wireguard.nix
../modules/wireguard.nix ../modules/qbittorrent.nix
../modules/qbittorrent.nix ../modules/gimp.nix
../modules/gimp.nix ../modules/openscad.nix
../modules/openscad.nix ../modules/bambu-studio-flatpak.nix
../modules/bambu-studio-flatpak.nix ../modules/arduino-ide.nix
../modules/arduino-ide.nix ../modules/bitwarden.nix
../modules/bitwarden.nix ../modules/vlc.nix
]; ../modules/devenv.nix
../modules/btop.nix
./mtp-fix.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -35,20 +38,17 @@
networking.hostName = "gandalf"; networking.hostName = "gandalf";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [
networking.firewall.enable = false; "192.168.68.56"
"1.1.1.1"
home-manager.users.avravels.home.hyprland.execOnce = [ "8.8.8.8"
"waybar"
"[workspace 1 silent] kitty"
"[workspace 1 silent] spotify"
"[workspace 2 silent] firefox"
]; ];
networking.firewall.enable = false;
networking.interfaces.enp130s0.wakeOnLan.enable = true; networking.interfaces.enp130s0.wakeOnLan.enable = true;
networking.firewall.allowedUDPPorts = [ 9 ]; networking.firewall.allowedUDPPorts = [ 9 ];
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
services.openssh.settings.X11Forwarding = true; services.openssh.settings.X11Forwarding = true;
hardware = { hardware = {
@@ -66,19 +66,5 @@
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
services = {
# Bluetooth fixes
# Can be removed when https://github.com/NixOS/nixpkgs/pull/499670 is merged and in 25.11
udev.extraRules = ''
SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="0489", ENV{ID_MODEL_ID}=="e111", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="0489", ATTRS{idProduct}=="e111", ENV{DEVTYPE}=="usb_interface", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
SUBSYSTEM=="usb", KERNEL=="3-14:*", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
SUBSYSTEM=="usb", KERNELS=="3-14", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{SOLID_IGNORE}="1"
'';
};
system.stateVersion = "25.11"; # Did you read the comment? system.stateVersion = "25.11"; # Did you read the comment?
} }

View File

@@ -1,28 +1,43 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config
, lib
, pkgs
, modulesPath
, ...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363"; device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/01E4-5DD7"; device = "/dev/disk/by-uuid/01E4-5DD7";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
}; "fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ]; swapDevices = [ ];

View File

@@ -0,0 +1,30 @@
{ pkgs, ... }:
{
nixpkgs.overlays = [
(
final: prev:
let
targetVersion = "1.1.23";
in
{
libmtp =
if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
prev.libmtp
else
prev.libmtp.overrideAttrs (_: {
version = targetVersion;
src = final.fetchFromGitHub {
owner = "libmtp";
repo = "libmtp";
rev = "v${targetVersion}";
hash = "sha256-FlPj9PEeOAWabU11dFTzDgY9TBbgmJclbeL0iULYw6A=";
};
patches = [ ];
});
}
)
];
}

View File

@@ -1,25 +1,28 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ ./hardware-configuration.nix
./hardware-configuration.nix ../modules/common.nix
../modules/common.nix ../modules/users.nix
../modules/users.nix ../modules/locales.nix
../modules/locales.nix ../modules/services.nix
../modules/services.nix ../modules/programs.nix
../modules/programs.nix ../modules/gaming.nix
../modules/gaming.nix ];
];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "legolas"; networking.hostName = "legolas";
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"
];
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
hardware = { hardware = {
graphics.enable = true; graphics.enable = true;

View File

@@ -1,33 +1,47 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config
, lib
, pkgs
, modulesPath
, ...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b"; device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/C4C8-E90E"; device = "/dev/disk/by-uuid/C4C8-E90E";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
}; "fmask=0022"
"dmask=0022"
];
};
fileSystems."/media" = fileSystems."/media" = {
{ device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232"; device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [ ];

View File

@@ -5,4 +5,3 @@
arduino-ide arduino-ide
]; ];
} }

View File

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

View File

@@ -9,4 +9,3 @@
bitwarden-desktop bitwarden-desktop
]; ];
} }

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

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

View File

@@ -3,7 +3,10 @@
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;

View File

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

View File

@@ -5,7 +5,10 @@
enable = true; enable = true;
settings = { settings = {
server = [ "1.1.1.1" "8.8.8.8" ]; server = [
"1.1.1.1"
"8.8.8.8"
];
address = [ "/.enova.local/127.0.0.1" ]; address = [ "/.enova.local/127.0.0.1" ];
}; };
}; };

View File

@@ -8,7 +8,7 @@
package = pkgs.steam.override { package = pkgs.steam.override {
extraEnv = { extraEnv = {
MANGOHUD = "1"; MANGOHUD = "1";
WINE_VK_VULKAN_ONLY="1"; WINE_VK_VULKAN_ONLY = "1";
}; };
}; };
}; };

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... } : { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

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

View File

@@ -1,4 +1,4 @@
{ pkgs, ...}: { pkgs, ... }:
{ {
home.packages = [ home.packages = [

View File

@@ -12,25 +12,28 @@
policies = { policies = {
# From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17 # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
ExtensionSettings = with builtins; ExtensionSettings =
let extension = shortId: uuid: { with builtins;
name = uuid; let
value = { extension = shortId: uuid: {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; name = uuid;
installation_mode = "normal_installed"; value = {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
installation_mode = "normal_installed";
};
}; };
}; in
in listToAttrs [ listToAttrs [
(extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
(extension "ublock-origin" "uBlock0@raymondhill.net") (extension "ublock-origin" "uBlock0@raymondhill.net")
(extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack") (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")
(extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack") (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack")
]; ];
# To add additional extensions, find it on addons.mozilla.org, find # To add additional extensions, find it on addons.mozilla.org, find
# the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
# Then, download the XPI by filling it in to the install_url template, unzip it, # Then, download the XPI by filling it in to the install_url template, unzip it,
# run `jq .browser_specific_settings.gecko.id manifest.json` or # run `jq .browser_specific_settings.gecko.id manifest.json` or
# `jq .applications.gecko.id manifest.json` to get the UUID # `jq .applications.gecko.id manifest.json` to get the UUID
}; };
}; };
} }

View File

@@ -1,4 +1,8 @@
{ lib, pkgsUnstable, config, ... }: { lib
, pkgsUnstable
, config
, ...
}:
{ {
options.home.git = { options.home.git = {

View File

@@ -30,132 +30,132 @@
]; ];
initLua = '' initLua = ''
vim.cmd("colorscheme catppuccin-mocha") vim.cmd("colorscheme catppuccin-mocha")
-- Basic settings -- Basic settings
vim.o.number = true vim.o.number = true
vim.o.relativenumber = true vim.o.relativenumber = true
-- ========================= -- =========================
-- LSP (Neovim 0.11+ way) -- LSP (Neovim 0.11+ way)
-- ========================= -- =========================
-- Add cmp capabilities -- Add cmp capabilities
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
vim.lsp.config("nil_ls", { vim.lsp.config("nil_ls", {
capabilities = capabilities, capabilities = capabilities,
}) })
-- PHP LSP -- PHP LSP
vim.lsp.config("intelephense", { vim.lsp.config("intelephense", {
capabilities = capabilities, capabilities = capabilities,
}) })
vim.lsp.enable("intelephense") vim.lsp.enable("intelephense")
vim.lsp.enable("nil_ls") vim.lsp.enable("nil_ls")
-- ========================= -- =========================
-- nvim-cmp -- nvim-cmp
-- ========================= -- =========================
local cmp = require("cmp") local cmp = require("cmp")
cmp.setup({ cmp.setup({
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true }), ["<CR>"] = cmp.mapping.confirm({ select = true }),
}), }),
sources = { sources = {
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "buffer" }, { name = "buffer" },
{ name = "path" }, { name = "path" },
}
})
-- =========================
-- Telescope
-- =========================
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-- =========================
-- Lualine (status line with Git branch)
-- =========================
require('lualine').setup {
options = {
theme = 'catppuccin', -- match your colorscheme
section_separators = {'', ''},
component_separators = {'', ''},
},
sections = {
lualine_a = {'mode'},
lualine_b = {'branch'}, -- shows Git branch here
lualine_c = {'filename'},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
}
} }
-- =========================
-- image-nvim
-- =========================
require("image").setup({
backend = "ueberzug", -- or "ueberzug" or "sixel"
processor = "magick_cli", -- or "magick_rock"
integrations = {
markdown = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup", -- or "inline"
floating_windows = false, -- if true, images will be rendered in floating markdown windows
filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
},
asciidoc = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup",
floating_windows = false,
filetypes = { "asciidoc", "adoc" },
},
neorg = {
enabled = true,
filetypes = { "norg" },
},
rst = {
enabled = true,
},
typst = {
enabled = true,
filetypes = { "typst" },
},
html = {
enabled = false,
},
css = {
enabled = false,
},
},
max_width = nil,
max_height = nil,
max_width_window_percentage = nil,
max_height_window_percentage = 50,
scale_factor = 1.0,
window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
}) })
-- =========================
-- Telescope
-- =========================
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-- =========================
-- Lualine (status line with Git branch)
-- =========================
require('lualine').setup {
options = {
theme = 'catppuccin', -- match your colorscheme
section_separators = {'', ''},
component_separators = {'', ''},
},
sections = {
lualine_a = {'mode'},
lualine_b = {'branch'}, -- shows Git branch here
lualine_c = {'filename'},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
}
}
-- =========================
-- image-nvim
-- =========================
require("image").setup({
backend = "ueberzug", -- or "ueberzug" or "sixel"
processor = "magick_cli", -- or "magick_rock"
integrations = {
markdown = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup", -- or "inline"
floating_windows = false, -- if true, images will be rendered in floating markdown windows
filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
},
asciidoc = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup",
floating_windows = false,
filetypes = { "asciidoc", "adoc" },
},
neorg = {
enabled = true,
filetypes = { "norg" },
},
rst = {
enabled = true,
},
typst = {
enabled = true,
filetypes = { "typst" },
},
html = {
enabled = false,
},
css = {
enabled = false,
},
},
max_width = nil,
max_height = nil,
max_width_window_percentage = nil,
max_height_window_percentage = 50,
scale_factor = 1.0,
window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
})
''; '';
}; };
} }

View File

@@ -5,4 +5,3 @@
ripgrep ripgrep
]; ];
} }

View File

@@ -9,10 +9,11 @@
ms-dotnettools.csharp ms-dotnettools.csharp
ms-dotnettools.csdevkit ms-dotnettools.csdevkit
ms-dotnettools.vscode-dotnet-runtime ms-dotnettools.vscode-dotnet-runtime
mkhl.direnv # Direnv integration for VSCode mkhl.direnv # Direnv integration for VSCode
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
bmewburn.vscode-intelephense-client bmewburn.vscode-intelephense-client
continue.continue continue.continue
vue.volar
]; ];
profiles.default.userSettings = { profiles.default.userSettings = {

View File

@@ -1,8 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.file.".zsh/fastfetch.jsonc".source = home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
./fastfetch/config.jsonc;
programs.zsh = { programs.zsh = {
enable = true; enable = true;

View File

@@ -2,8 +2,8 @@
{ {
home.pointerCursor = { home.pointerCursor = {
# name = "Bibata-Modern-Ice"; # change to your cursor theme # name = "Bibata-Modern-Ice"; # change to your cursor theme
# package = pkgs.bibata-cursors; # package = pkgs.bibata-cursors;
name = "Adwaita"; name = "Adwaita";
package = pkgs.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
size = 24; size = 24;

View File

@@ -1,17 +1,35 @@
{ lib, pkgs, config, ... }: { lib
, pkgs
, config
, ...
}:
let let
cfg = config.home.hyprland; cfg = config.home.hyprland;
in in
{ {
options.home.hyprland = { options.home.hyprland.monitors = lib.mkOption {
execOnce = lib.mkOption { type = lib.types.listOf (lib.types.submodule {
type = lib.types.listOf lib.types.str; options = {
default = [ "waybar" ]; output = lib.mkOption { type = lib.types.str; };
description = "Commands to run once when Hyprland starts (maps to Hyprland `exec-once`)."; mode = lib.mkOption {
}; type = lib.types.str;
default = "preferred";
};
position = lib.mkOption {
type = lib.types.str;
default = "auto";
};
scale = lib.mkOption {
type = lib.types.number;
default = 1;
};
};
});
default = [ ];
}; };
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [
bzmenu bzmenu
@@ -25,145 +43,173 @@ in
enable = true; enable = true;
configType = "lua"; configType = "lua";
settings = settings =
let let
mkLuaInline = lib.generators.mkLuaInline; mkLuaInline = lib.generators.mkLuaInline;
toLua = lib.generators.toLua; toLua = lib.generators.toLua;
mkArgs = args: { _args = args; }; mkArgs = args: { _args = args; };
bind = defaultMonitor = {
keys: dispatcher: options: output = "";
mkArgs [ mode = "preferred";
keys position = "auto";
dispatcher scale = 1;
options };
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} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") { })
(bind "${mod} + Q" (dsp.window.close) { })
(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; })
];
on = [
(mkArgs [
"hyprland.start"
(mkLuaInline ''
function()
hl.exec_cmd("waybar")
hl.monitor(${toLua {} defaultMonitor})
${lib.concatMapStringsSep "\n"
(m: "hl.monitor(${toLua {} m})")
cfg.monitors}
end
'')
])
(mkArgs [
"config.reloaded"
(mkLuaInline ''
function()
hl.monitor(${toLua {} defaultMonitor})
${lib.concatMapStringsSep "\n"
(m: "hl.monitor(${toLua {} m})")
cfg.monitors}
end
'')
])
]; ];
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; })
];
on = mkArgs [
"hyprland.start"
(mkLuaInline ''
function()
hl.exec_cmd("waybar")
end'')
];
};
}; };
}; };
} }

View File

@@ -10,13 +10,18 @@ in
enable = true; enable = true;
settings = { settings = {
splash = false;
preload = [ preload = [
wallpaper wallpaper
wallpaper2 wallpaper2
wallpaper3 wallpaper3
]; ];
wallpaper = [ wallpaper = [
",${wallpaper3}" {
monitor = "";
path = wallpaper3;
}
]; ];
}; };
}; };

View File

@@ -35,7 +35,11 @@
scroll-step = 5; scroll-step = 5;
format-icons = { format-icons = {
default = [ "󰕿" "󰖀" "󰕾" ]; default = [
"󰕿"
"󰖀"
"󰕾"
];
}; };
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
@@ -46,7 +50,10 @@
format = "{player_icon} {artist} - {title}"; format = "{player_icon} {artist} - {title}";
format-paused = "{player_icon} {title}"; format-paused = "{player_icon} {title}";
tooltip = true; tooltip = true;
ignored-players = [ "firefox" "vlc" ]; ignored-players = [
"firefox"
"vlc"
];
}; };
cpu = { cpu = {

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... } : { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... } : { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@@ -1,5 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, ... } :
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@@ -34,6 +34,9 @@
# for samba # for samba
networking.hosts = { networking.hosts = {
"192.168.68.60" = [ "2C2919000000.local" "2C2919000000" ]; "192.168.68.60" = [
"2C2919000000.local"
"2C2919000000"
];
}; };
} }

View File

@@ -10,4 +10,3 @@
virt-manager.enable = true; virt-manager.enable = true;
}; };
} }

View File

@@ -5,7 +5,12 @@
initialPassword = "welcome"; initialPassword = "welcome";
isNormalUser = true; isNormalUser = true;
description = "Armel van Ravels"; description = "Armel van Ravels";
extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"]; extraGroups = [
"networkmanager"
"wheel"
"libvirtd"
"dialout"
];
packages = with pkgs; [ packages = with pkgs; [
home-manager home-manager
legcord legcord

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

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

View File

@@ -1,30 +1,31 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ ./hardware-configuration.nix
./hardware-configuration.nix ../modules/home-manager.nix
../modules/home-manager.nix ../modules/common.nix
../modules/common.nix ../modules/users.nix
../modules/users.nix ../modules/locales.nix
../modules/locales.nix ../modules/services.nix
../modules/services.nix ../modules/programs.nix
../modules/programs.nix ../modules/garbage-collection.nix
../modules/garbage-collection.nix ../modules/printing.nix
../modules/printing.nix ../modules/docker.nix
../modules/docker.nix ../modules/teams-for-linux.nix
../modules/teams-for-linux.nix ../modules/azure-data-studio.nix
../modules/azure-data-studio.nix ../modules/filezilla.nix
../modules/filezilla.nix ../modules/wireguard.nix
../modules/wireguard.nix ../modules/remmina.nix
../modules/remmina.nix ../modules/postman.nix
../modules/postman.nix ../modules/gimp.nix
../modules/gimp.nix ../modules/jq.nix
../modules/jq.nix ../modules/enova.nix
../modules/enova.nix ../modules/devenv.nix
../modules/devenv.nix ../modules/bitwarden.nix
../modules/bitwarden.nix ../modules/btop.nix
]; ../modules/vlc.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -38,19 +39,16 @@
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
networking.hostName = "laptop-armel"; networking.hostName = "laptop-armel";
home-manager.users.avravels.home.hyprland.execOnce = [
"waybar"
"[workspace 1 silent] kitty"
"[workspace 2 silent] firefox"
"[workspace 2 silent] teams-for-linux"
"[workspace 3 silent] spotify"
];
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";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "127.0.0.1" "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [
"127.0.0.1"
"192.168.68.56"
"1.1.1.1"
"8.8.8.8"
];
networking.firewall.enable = false; networking.firewall.enable = false;
hardware.graphics.enable = true; hardware.graphics.enable = true;
@@ -58,8 +56,35 @@
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
specialisation = {
"top floor".configuration = {
home-manager.users.avravels.home.hyprland.monitors = [
{
output = "DP-3";
mode = "2560x1440";
position = "0x0";
}
{
output = "DP-1";
mode = "2560x1440";
position = "2560x0";
}
{
output = "eDP-1";
mode = "1920x1200";
position = "5120x0";
}
];
};
};
networking.hosts = { networking.hosts = {
"127.0.0.1" = [ "local.wormundco.de" "local.wormundco.nl" "local.wormenco.nl" "local.wurmundco.de" ]; "127.0.0.1" = [
"local.wormundco.de"
"local.wormundco.nl"
"local.wormenco.nl"
"local.wurmundco.de"
];
"149.210.174.226" = [ "kindertelefoon" ]; "149.210.174.226" = [ "kindertelefoon" ];
}; };

View File

@@ -1,30 +1,45 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config
, lib
, pkgs
, modulesPath
, ...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba"; device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device = "/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba"; boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device =
"/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/3892-6129"; device = "/dev/disk/by-uuid/3892-6129";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
}; "fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ]; swapDevices = [ ];