Compare commits

...

6 Commits

Author SHA1 Message Date
1e738d598b disable dark mode, update and add firefox+jabref 2025-10-15 15:43:19 +02:00
250caeaf32 normal cursor and brave darkmode 2025-09-20 19:21:24 +02:00
6c4c3d54aa update and drop catppuccin 2025-09-19 15:12:01 +02:00
a6871f94a8 stuff 2025-08-06 11:22:10 +02:00
d50def1368 avoid warnings 2025-07-15 11:20:35 +02:00
ff226f342c better bluetooth integration 2025-07-15 10:45:43 +02:00
16 changed files with 120 additions and 99 deletions

49
flake.lock generated
View File

@@ -1,23 +1,5 @@
{
"nodes": {
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1751880463,
"narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=",
"owner": "catppuccin",
"repo": "nix",
"rev": "9474347c69e93e392f194dda7a57c641ba4b998e",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -25,11 +7,11 @@
]
},
"locked": {
"lastModified": 1751810233,
"narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github"
},
"original": {
@@ -41,27 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750776420,
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
"lastModified": 1760139962,
"narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1751741127,
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "29e290002bfff26af1db6f64d070698019460302",
"rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",
"type": "github"
},
"original": {
@@ -73,9 +39,8 @@
},
"root": {
"inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
}
}
},

View File

@@ -4,8 +4,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
catppuccin.url = "github:catppuccin/nix";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
@@ -13,27 +11,25 @@
};
outputs = inputs@{ self, nixpkgs, catppuccin, home-manager, ... }: {
outputs = inputs@{ self, nixpkgs, home-manager, ... }: {
nixosConfigurations = {
segfault-machine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
specialArgs = { inherit inputs; };
modules = [
./hosts/segfault-machine/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.nixosModules.home-manager {
home-manager.backupFileExtension = "backup";
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.lukas.imports = [
./home/lukas/default.nix
];
./home/lukas/default.nix
];
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.extraSpecialArgs = { inherit inputs; };
}
];

View File

@@ -1,3 +0,0 @@
{
services.blueman.enable = true;
}

View File

@@ -2,6 +2,11 @@
programs.brave = {
enable = true;
commandLineArgs = [
"--force-dark-mode"
#"--enable-features=WebContentsForceDark"
];
extensions = [
# Catppuccin for GitHub File Explorer Icons
{ id = "lnjaiaapbakfhlbjenjkhffcdpoompki"; }

View File

@@ -1,4 +1,4 @@
{ inputs, pkgs, ... }:
{ inputs, ... }:
{
imports = [ inputs.catppuccin.homeModules.catppuccin ];
@@ -7,26 +7,14 @@
flavor = "mocha";
enable = true;
bat.enable = true; # <- installs Catppuccin-Mocha.tmTheme
delta.enable = true; # <- colours delta with your mauve accent
cursors = {
enable = true;
flavor = "mocha";
accent = "mauve";
};
waybar.enable = false;
rofi.enable = false;
};
gtk = {
enable = true;
catppuccin = {
enable = true;
cursor = {
enable = true;
flavor = "mocha";
accent = "mauve";
};
};
cursorTheme = {
size = 38;
name = "catppuccin-mocha-mauve-cursors";
};
};
}

View File

@@ -1,7 +1,7 @@
{
imports = [
./brave.nix
./catppuccin.nix
# ./catppuccin.nix
./direnv.nix
./emacs.nix
./git.nix

View File

@@ -1,4 +1,13 @@
{ pkgs, ... }:
{
home.pointerCursor = {
name = "Vanilla-DMZ";
package = pkgs.vanilla-dmz;
size = 24;
gtk.enable = true;
x11.enable = true;
};
wayland.windowManager.hyprland = {
enable = true;
@@ -8,24 +17,32 @@
exec-once = [
"waybar"
"dunst"
"kwalletd6"
"nm-applet"
"blueman-applet"
"swww-daemon"
"swayidle -w \
timeout 300 'hyprlock' \
timeout 360 'hyprctl dispatch dpms off' \
resume 'hyprctl dispatch dpms on' \
before-sleep 'hyprlock'
"
"swayidle -w timeout 300 'hyprlock' timeout 360 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'hyprlock'"
"swww img $HOME/Bilder/Wallpapers/mountain.jpg"
"nextcloud"
];
env = [
"HYPRCURSOR_THEME,Vanilla-DMZ"
"HYPRCURSOR_SIZE,24"
"XCURSOR_THEME,Vanilla-DMZ"
"GDK_SCALE,2"
"XCURSOR_SIZE,32"
];
#windowrulev2 = [
# do not let scenbuilder take focus
# "nofocus, title:^(.*java.*)$"
#];
monitor = [
", highres, auto, 1"
];
@@ -39,6 +56,8 @@
force_zero_scaling = true;
};
# windowrule = "stayfocused,^(com.oracle.javafx.scenebuilder.app.SceneBuilderApp)$";
bind = [
@@ -51,6 +70,8 @@
# lock screen
"$mod, L, exec, hyprlock"
"$mod, S, togglefloating"
# emacs
"$mod, e, exec, emacs"

View File

@@ -16,6 +16,15 @@
pkgs.wget
pkgs.unzip
pkgs.feather
pkgs.electrum
pkgs.firefox
pkgs.zathura
pkgs.xfce.thunar
pkgs.ranger
pkgs.nerd-fonts.fira-code
pkgs.fira-code
pkgs.meslo-lgs-nf
@@ -24,12 +33,19 @@
pkgs.bat
pkgs.ripgrep
pkgs.seahorse
pkgs.binutils
pkgs.gcc
pkgs.scenebuilder
pkgs.nil
pkgs.quickemu
pkgs.zotero
pkgs.jabref
(pkgs.aspellWithDicts
(dicts: with dicts; [ de en en-computers ]))

View File

@@ -230,7 +230,8 @@ let
"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
"on-click": "blueman-manager"
}
}
'';

View File

@@ -1,14 +1,19 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
imports = [
./hardware.nix
../../users/lukas.nix
../../modules/desktop/hyprland.nix
../../modules/input/katana.nix
../../modules/networking/networkmanager.nix
../../modules/networking/bluetooth.nix
../../modules/system/locale.nix
../../modules/system/audio.nix
../../modules/system/printing.nix
../../modules/system/docker.nix
../../modules/system/gpg.nix
../../modules/system/virtualbox.nix
../../modules/system/mullvad.nix
];
networking.hostName = "segfault-machine";

View File

@@ -13,6 +13,9 @@
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.kernelParams = [ "amd_iommu=on" ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/5af0ed50-72c4-4bee-8c6e-7b0556cffbc7";
fsType = "ext4";
@@ -41,9 +44,7 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
services.hardware.bolt.enable = true;
services.fwupd.enable = true;
}

View File

@@ -28,17 +28,6 @@
enable = true;
keyboards = {
internalKeyboard = {
devices = [
# Replace the paths below with the appropriate device paths for your setup.
# Use `ls /dev/input/by-path/` to find your keyboard devices.
"/dev/input/by-path/pci-0000:66:00.0-usb-0:2.3:1.0-event-kbd"
"/dev/input/by-path/pci-0000:66:00.0-usb-0:2.4:1.0-event-kbd"
"/dev/input/by-path/pci-0000:66:00.0-usb-0:2.4:1.2-event-kbd"
"/dev/input/by-path/pci-0000:66:00.0-usbv2-0:2.3:1.0-event-kbd"
"/dev/input/by-path/pci-0000:66:00.0-usbv2-0:2.4:1.0-event-kbd"
"/dev/input/by-path/pci-0000:66:00.0-usbv2-0:2.4:1.2-event-kbd"
"/dev/input/by-path/platform-i8042-serio-0-event-kbd"
];
extraDefCfg = "process-unmapped-keys yes";
config = ''
(defsrc

View File

@@ -0,0 +1,8 @@
{
hardware.bluetooth = {
enable = true;
powerOnBoot = false;
};
services.blueman.enable = true;
}

10
modules/system/gpg.nix Normal file
View File

@@ -0,0 +1,10 @@
{pkgs, ...}:
{
services.pcscd.enable = true;
programs.gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-curses;
enableSSHSupport = true;
};
}

View File

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

View File

@@ -0,0 +1,14 @@
{
nixpkgs.config.allowUnfree = true;
virtualisation.virtualbox.host = {
enable = true;
enableKvm = true;
enableHardening = false;
addNetworkInterface = false;
};
users.extraGroups.vboxusers.members = [ "lukas" ];
virtualisation.virtualbox.host.enableExtensionPack = true;
}