Compare commits

...

4 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
12 changed files with 101 additions and 66 deletions

49
flake.lock generated
View File

@@ -1,23 +1,5 @@
{ {
"nodes": { "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -25,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751810233, "lastModified": 1758463745,
"narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -41,27 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750776420, "lastModified": 1760139962,
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -73,9 +39,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
} }
} }
}, },

View File

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

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

View File

@@ -1,7 +1,7 @@
{ {
imports = [ imports = [
./brave.nix ./brave.nix
./catppuccin.nix # ./catppuccin.nix
./direnv.nix ./direnv.nix
./emacs.nix ./emacs.nix
./git.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 = { wayland.windowManager.hyprland = {
enable = true; enable = true;
@@ -8,19 +17,32 @@
exec-once = [ exec-once = [
"waybar" "waybar"
"dunst" "dunst"
"kwalletd6"
"nm-applet" "nm-applet"
"blueman-applet" "blueman-applet"
"swww-daemon" "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" "swww img $HOME/Bilder/Wallpapers/mountain.jpg"
"nextcloud"
]; ];
env = [ env = [
"HYPRCURSOR_THEME,Vanilla-DMZ"
"HYPRCURSOR_SIZE,24"
"XCURSOR_THEME,Vanilla-DMZ"
"GDK_SCALE,2" "GDK_SCALE,2"
"XCURSOR_SIZE,32" "XCURSOR_SIZE,32"
]; ];
#windowrulev2 = [
# do not let scenbuilder take focus
# "nofocus, title:^(.*java.*)$"
#];
monitor = [ monitor = [
", highres, auto, 1" ", highres, auto, 1"
]; ];
@@ -34,6 +56,8 @@
force_zero_scaling = true; force_zero_scaling = true;
}; };
# windowrule = "stayfocused,^(com.oracle.javafx.scenebuilder.app.SceneBuilderApp)$";
bind = [ bind = [
@@ -46,6 +70,8 @@
# lock screen # lock screen
"$mod, L, exec, hyprlock" "$mod, L, exec, hyprlock"
"$mod, S, togglefloating"
# emacs # emacs
"$mod, e, exec, emacs" "$mod, e, exec, emacs"

View File

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

View File

@@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
imports = [ imports = [
./hardware.nix ./hardware.nix
../../users/lukas.nix ../../users/lukas.nix
@@ -10,6 +11,9 @@
../../modules/system/audio.nix ../../modules/system/audio.nix
../../modules/system/printing.nix ../../modules/system/printing.nix
../../modules/system/docker.nix ../../modules/system/docker.nix
../../modules/system/gpg.nix
../../modules/system/virtualbox.nix
../../modules/system/mullvad.nix
]; ];
networking.hostName = "segfault-machine"; networking.hostName = "segfault-machine";

View File

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

View File

@@ -28,17 +28,6 @@
enable = true; enable = true;
keyboards = { keyboards = {
internalKeyboard = { 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"; extraDefCfg = "process-unmapped-keys yes";
config = '' config = ''
(defsrc (defsrc

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;
}