disable dark mode, update and add firefox+jabref

flake.lock

@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "catppuccin": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1749223974,
-        "narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -25,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749154018,
+        "lastModified": 1758463745,
-        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
         "type": "github"
       },
       "original": {
@@ -41,27 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1749794982,
+        "lastModified": 1760139962,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1749727998,
-        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
         "type": "github"
       },
       "original": {
@@ -73,9 +39,8 @@
     },
     "root": {
       "inputs": {
-        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },

flake.nix

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

home/lukas/alacritty.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+
+      terminal.shell = {
+        program = "${pkgs.tmux}/bin/tmux";
+        args = [ "new-session" "-A" "-s" "main" ];
+      };
+
+      window = {
+          opacity = 0.85;
+     };
+    };
+  };
+}
+

home/lukas/brave.nix

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

home/lukas/catppuccin.nix

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

home/lukas/default.nix

@@ -1,16 +1,19 @@
-{ config, pkgs, ... }:
-
 {
   imports = [
     ./brave.nix
-    ./catppuccin.nix
+    # ./catppuccin.nix
     ./direnv.nix
     ./emacs.nix
     ./git.nix
     ./packages.nix
     ./shell.nix
-    ./terminal.nix
+    ./alacritty.nix
+    ./tmux.nix
     ./xgd.nix
+    ./hyprland.nix
+    ./waybar.nix
+    ./rofi.nix
+    ./libreoffice.nix
   ];
 
   home.username = "lukas";

home/lukas/git.nix

@@ -1,4 +1,3 @@
-{ config, lib, pkgs, ... }:
 let
   userPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1DsMfyMUK0snbTeVWMmdzLP9NIvPoQ4tjqyREUMHwZ mail@lukas.contact";
 in {
@@ -13,6 +12,9 @@ in {
       gpg.format = "ssh";
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
       user.signingkey = "~/.ssh/id_ed25519.pub";
+      pull.rebase = false;
+      init.defaultBranch = "master";
+      core.sshCommand = "ssh -4";
     };
   };
 }

home/lukas/hyprland.nix

@@ -0,0 +1,157 @@
+{ pkgs, ... }:
+{
+  home.pointerCursor = {
+    name = "Vanilla-DMZ";
+    package = pkgs.vanilla-dmz;
+    size = 24;
+    gtk.enable = true;
+    x11.enable = true;
+  };
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+
+    settings = {
+      "$mod" = "ALT";
+
+      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'"
+        "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"
+      ];
+
+
+      binds = {
+        allow_workspace_cycles = true;
+      };
+
+      xwayland = {
+        force_zero_scaling = true;
+      };
+
+      # windowrule = "stayfocused,^(com.oracle.javafx.scenebuilder.app.SceneBuilderApp)$";
+
+
+      bind = [
+
+        # terminal
+        "$mod, Return, exec, alacritty"
+
+        # kill current window
+        "$mod, Q, killactive,"
+
+        # lock screen
+        "$mod, L, exec, hyprlock"
+
+        "$mod, S, togglefloating"
+
+        # emacs
+        "$mod, e, exec, emacs"
+
+        # Rofi launcher
+        "$mod, SPACE, exec, rofi -show drun"
+
+        # Toggle fullscreen
+        "$mod, M, fullscreen, 2"
+
+        # cycle windows
+        "$mod, N, cyclenext"
+        # cycle workspaces
+        "$mod, Tab, workspace, r+1"
+        "$mod Shift, Tab, workspace, r-1"
+
+        "$mod, V, togglefloating"
+
+        # Switch to workspace 1–9
+        "$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"
+
+        # screenshot
+        ", PRINT, exec, hyprshot -m region --clipboard-only"
+
+        # toggle muting speacers and mic
+        ", XF86AudioMute,        exec, wpctl set-mute   @DEFAULT_AUDIO_SINK@ toggle"
+        ", XF86AudioMicMute,     exec, wpctl set-mute   @DEFAULT_AUDIO_SOURCE@ toggle"
+      ];
+
+      binde = [
+        # audio
+        ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.25 @DEFAULT_AUDIO_SINK@ 5%-"
+        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.25 @DEFAULT_AUDIO_SINK@ 5%+"
+
+        # brightness
+        ", XF86MonBrightnessDown, exec, brightnessctl set 10%-"
+        ", XF86MonBrightnessUp,   exec, brightnessctl set 10%+"
+      ];
+
+
+      general = {
+        gaps_in = 4;
+        gaps_out = 8;
+        border_size = 0;
+        layout = "dwindle";
+      };
+
+      input = {
+        kb_layout = "de";
+        touchpad.disable_while_typing = true;
+      };
+
+      cursor = {
+        inactive_timeout = 5;
+      };
+
+      decoration = {
+        rounding = 6;
+        blur.enabled = false;
+        shadow.enabled = false;
+      };
+    };
+  };
+
+  services.udiskie.enable = true;
+}

home/lukas/libreoffice.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+let
+  libreoffice = pkgs.libreoffice;
+in {
+
+  home.packages = with pkgs; [
+    libreoffice
+    hunspell
+    hunspellDicts.en_US
+    hunspellDicts.de_DE
+  ];
+}

home/lukas/packages.nix

@@ -16,21 +16,47 @@
     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
 
     pkgs.eza
     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 ]))
 
+    # stuff for the waybar
+    pkgs.nerd-fonts.jetbrains-mono
+    pkgs.brightnessctl
+    pkgs.bluez
+    pkgs.bluetui
+    pkgs.jq
+    pkgs.lm_sensors
   ];
 }
 

home/lukas/rofi.nix

@@ -0,0 +1,121 @@
+{config, ...}:
+
+let
+  fullTheme = ''
+    * {
+        bg0:    #2E3440F2;
+        bg1:    #3B4252;
+        bg2:    #4C566A80;
+        bg3:    #88C0D0F2;
+        fg0:    #D8DEE9;
+        fg1:    #ECEFF4;
+        fg2:    #D8DEE9;
+        fg3:    #4C566A;
+    }
+
+    * {
+        font:            "Fira Code 12";
+        background-color: transparent;
+        text-color:       @fg0;
+
+        margin:     0px;
+        padding:    0px;
+        spacing:    0px;
+    }
+
+    window {
+        location:       north;
+        y-offset:       calc(50% - 176px);
+        width:          480;
+        border-radius:  24px;
+
+        background-color:   @bg0;
+    }
+
+    mainbox {
+        padding:    12px;
+    }
+
+    inputbar {
+        background-color:   @bg1;
+        border-color:       @bg3;
+
+        border:         2px;
+        border-radius:  16px;
+
+        padding:    8px 16px;
+        spacing:    8px;
+        children:   [ prompt, entry ];
+    }
+
+    prompt {
+        text-color: @fg2;
+    }
+
+    entry {
+        placeholder:        "Search";
+        placeholder-color:  @fg3;
+    }
+
+    message {
+        margin:             12px 0 0;
+        border-radius:      16px;
+        border-color:       @bg2;
+        background-color:   @bg2;
+    }
+
+    textbox {
+        padding:    8px 24px;
+    }
+
+    listview {
+        background-color:   transparent;
+
+        margin:     12px 0 0;
+        lines:      8;
+        columns:    1;
+
+        fixed-height: false;
+    }
+
+    element {
+        padding:        8px 16px;
+        spacing:        8px;
+        border-radius:  16px;
+    }
+
+    element normal active {
+        text-color: @bg3;
+    }
+
+    element alternate active {
+        text-color: @bg3;
+    }
+
+    element selected normal, element selected active {
+        background-color:   @bg3;
+    }
+
+    element-icon {
+        size:           1em;
+        vertical-align: 0.5;
+    }
+
+    element-text {
+        text-color: inherit;
+    }
+
+    /* your override */
+    element selected {
+        text-color: @bg1;
+    }
+  '';
+in {
+  home.file.".config/rofi/theme.rasi".text = fullTheme;
+
+
+  programs.rofi = {
+    enable = true;
+    theme  = "${config.xdg.configHome}/rofi/theme.rasi";
+  };
+}

home/lukas/tmux.nix

@@ -9,16 +9,16 @@
       set-option -g history-limit 50000
       set -g default-shell "${pkgs.zsh}/bin/zsh"
       set -g default-terminal "tmux-256color"
+
+      # split bindings: prefix+v = vertical split (side-by-side)
+      bind v split-window -h
+
+      # split bindings: prefix+h = horizontal split (top/bottom)
+      bind h split-window -v
+
+      # hide the status bar
+      set -g status off
+
     '';
   };
-
-
-  programs.alacritty = {
-    enable = true;
-    settings.terminal.shell = {
-        program = "${pkgs.tmux}/bin/tmux";
-        args = [ "new-session" "-A" "-s" "main" ];
-      };
-  };
 }
-

home/lukas/waybar.nix

@@ -1,44 +1,241 @@
-{ pkgs, ... }:
+let
+  fullStyle = ''
+    * {
+      min-height: 0;
+      min-width: 0;
+      font-family: FiraCode;
+      font-size: 16px;
+      font-weight: 600;
+    }
 
+    window#waybar {
+      transition-property: background-color;
+      transition-duration: 0.5s;
+      /* background-color: #1e1e2e; */
+      /* background-color: #181825; */
+      background-color: #11111b;
+      /* background-color: rgba(24, 24, 37, 0.6); */
+    }
+
+    #workspaces button {
+      padding: 0.3rem 0.6rem;
+      margin: 0.4rem 0.25rem;
+      border-radius: 6px;
+      /* background-color: #181825; */
+      background-color: #1e1e2e;
+      color: #cdd6f4;
+    }
+
+    #workspaces button:hover {
+      color: #1e1e2e;
+      background-color: #cdd6f4;
+    }
+
+    #workspaces button.active {
+      background-color: #1e1e2e;
+      color: #89b4fa;
+    }
+
+    #workspaces button.urgent {
+      background-color: #1e1e2e;
+      color: #f38ba8;
+    }
+
+    #clock,
+    #pulseaudio,
+    #custom-logo,
+    #custom-power,
+    #custom-spotify,
+    #custom-notification,
+    #cpu,
+    #tray,
+    #memory,
+    #window,
+    #mpris {
+      padding: 0.3rem 0.6rem;
+      margin: 0.4rem 0.25rem;
+      border-radius: 6px;
+      /* background-color: #181825; */
+      background-color: #1e1e2e;
+    }
+
+    #mpris.playing {
+      color: #a6e3a1;
+    }
+
+    #mpris.paused {
+      color: #9399b2;
+    }
+
+    #custom-sep {
+      padding: 0px;
+      color: #585b70;
+    }
+
+    window#waybar.empty #window {
+      background-color: transparent;
+    }
+
+    #cpu {
+      color: #94e2d5;
+    }
+
+    #memory {
+      color: #cba6f7;
+    }
+
+    #clock {
+      color: #74c7ec;
+    }
+
+    #clock.simpleclock {
+      color: #89b4fa;
+    }
+
+    #window {
+      color: #cdd6f4;
+    }
+
+    #pulseaudio {
+      color: #b4befe;
+    }
+
+    #pulseaudio.muted {
+      color: #a6adc8;
+    }
+
+    #custom-logo {
+      color: #89b4fa;
+    }
+
+    #custom-power {
+      color: #f38ba8;
+    }
+
+    tooltip {
+      background-color: #181825;
+      border: 2px solid #89b4fa;
+    }
+  '';
+
+  fullConfig = ''
 {
-  home.packages = with pkgs; [
+  "layer": "top",
-    waybar networkmanagerapplet 
+  "position": "top",
-  ];
+  "height": 32,
-  programs.waybar = {
+  "spacing": 0,
-    catppuccin.enable = true;
+  "modules-left": [
-    enable = true;
+    "hyprland/workspaces",
-    systemd.enable = true;        # auto-restart on crashes
+  ],
-    settings = {
+  "modules-right": [
-      mainBar = {
+    "pulseaudio",
-        layer = "top";
+    "backlight",
-        position = "top";
+    "bluetooth",
-        height = 32;
+    "network",
-        modules-left  = [ "hyprland/workspaces" ];
+    "battery",
-        modules-center = [ "clock" ];
+    "clock",
-        modules-right = [
+    "tray",
-          "network"
+    "custom/reboot",
-          "pulseaudio"
+    "custom/power"
-          "battery"
+  ],
-          "tray"
+  "hyprland/workspaces": {
-        ];
+    "disable-scroll": false,
-
+    "all-outputs": true,
-        # `network` module shows SSID + signal; no need for nm-applet text
+    "format": "{icon}",
-        "network" = {
+    "on-click": "activate",
-          format-wifi = "{ssid}    {signalStrength}%";
+    "persistent-workspaces": {
-          format-disconnected = "";
+    "*":[1,2,3,4]
-        };
+    },
-      };
+    "format-icons": {
-    };
+      "1": "󰞷",
-  };
+      "2": "󰖟",
-
+      "3": "",
-  # Start nm-applet once; Waybar's SNI tray picks it up.
+      "4": "",
-  systemd.user.services."nm-applet" = {
+      "default": ""
-    Unit.Description = "NetworkManager Applet";
+    }
-    Service = {
+  },
-      ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator";
+  "custom/reboot": {
-      Restart   = "on-failure";
+    "format": "<span color='#FFD700'>  </span>",
-    };
+    "on-click": "systemctl reboot",
-    Install.WantedBy = [ "graphical-session.target" ];
+    "tooltip": true,
-  };
+  },
+  "custom/power": {
+    "format": "<span color='#FF4040'>  </span>",
+    "on-click": "systemctl poweroff",
+    "tooltip": true,
+  },
+  "network": {
+    "format-wifi": "<span color='#00FFFF'> 󰤨 </span>{essid} ",
+    "format-ethernet": "<span color='#7FFF00'> </span>Wired ",
+    "tooltip-format": "<span color='#FF1493'> 󰅧 </span>{bandwidthUpBytes}  <span color='#00BFFF'> 󰅢 </span>{bandwidthDownBytes}",
+    "format-linked": "<span color='#FFA500'> 󱘖 </span>{ifname} (No IP) ",
+    "format-disconnected": "<span color='#FF4040'>  </span>Disconnected ",
+    "format-alt": "<span color='#00FFFF'> 󰤨 </span>{signalStrength}% ",
+    "interval": 1
+  },
+  "battery": {
+    "states": {
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "<span color='#28CD41'> {icon} </span>{capacity}% ",
+    "format-charging": " 󱐋{capacity}%",
+    "interval": 1,
+    "format-icons": ["󰂎", "󰁼", "󰁿", "󰂁", "󰁹"],
+    "tooltip": true
+  },
+  "pulseaudio": {
+    "format": "<span color='#00FF7F'>{icon}</span>{volume}% ",
+    "format-muted": "<span color='#FF4040'> 󰖁 </span>0% ",
+    "format-icons": {
+      "headphone": "<span color='#BF00FF'>  </span>",
+      "hands-free": "<span color='#BF00FF'>  </span>",
+      "headset": "<span color='#BF00FF'>  </span>",
+      "phone": "<span color='#00FFFF'>  </span>",
+      "portable": "<span color='#00FFFF'>  </span>",
+      "car": "<span color='#FFA500'>  </span>",
+      "default": [
+        "<span color='#808080'>  </span>",
+        "<span color='#FFFF66'>  </span>",
+        "<span color='#00FF7F'>  </span>"
+      ]
+    },
+    "on-click-right": "pavucontrol -t 3",
+    "on-click": "pactl -- set-sink-mute 0 toggle",
+  },
+  "clock": {
+    "interval": 1,
+    "timezone": "Europe/Berlin",
+    "format": "<span color='#BF00FF'>  </span>{:%H:%M} ",
+  },
+  "tray": {
+    "icon-size": 17,
+    "spacing": 6
+  },
+  "backlight": {
+    "device": "intel_backlight",
+    "format": "<span color='#FFD700'>{icon}</span>{percent}% ",
+    "tooltip": true,
+    "format-icons": [
+      "<span color='#696969'> 󰃞 </span>",
+      "<span color='#A9A9A9'> 󰃝 </span>",
+      "<span color='#FFFF66'> 󰃟 </span>",
+      "<span color='#FFD700'> 󰃠 </span>"
+    ]
+  },
+  "bluetooth": {
+    "format": "<span color='#00BFFF'>  </span>{status} ",
+    "format-connected": "<span color='#00BFFF'>  </span>{device_alias} ",
+    "format-connected-battery": "<span color='#00BFFF'>  </span>{device_alias}{device_battery_percentage}% ",
+    "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}%",
+    "on-click": "blueman-manager"
+  }
+}
+  '';
+in {
+  home.file.".config/waybar/style.css".text = fullStyle;
+  home.file.".config/waybar/config.jsonc".text = fullConfig;
 }
-

hosts/segfault-machine/configuration.nix

@@ -1,13 +1,19 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
     ./hardware.nix
     ../../users/lukas.nix
-    ../../modules/desktop/gnome.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";

hosts/segfault-machine/hardware.nix

@@ -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 = {
+  services.hardware.bolt.enable = true;
-    enable = true;
-    powerOnBoot = true;
-  };
 
+  services.fwupd.enable = true;
 }

modules/desktop/hyprland.nix

@@ -0,0 +1,58 @@
+{ pkgs, ... }:
+
+{
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    xwayland.enable = true;
+  };
+
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+  };
+
+  hardware.graphics.enable = true;
+
+  environment.systemPackages = [
+    (pkgs.waybar.overrideAttrs (oldAttrs: {
+      mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
+    }))
+    pkgs.dunst
+    pkgs.libnotify
+    pkgs.swww
+    pkgs.rofi-wayland
+    pkgs.hyprlock
+    pkgs.hyprshot
+    pkgs.swayidle
+    pkgs.udiskie
+
+    pkgs.brightnessctl    # adjust backlight via keybindings
+    pkgs.scrot            # simple screenshot
+    pkgs.slurp            # region selector
+    pkgs.grim             # wayland screenshot backend
+    pkgs.networkmanagerapplet
+    pkgs.pavucontrol
+  ];
+
+  xdg.portal.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+
+  services.udisks2.enable = true;
+
+
+  services.greetd = {
+    enable = true;
+    settings = {
+      initial_session = {
+        command = "${pkgs.hyprland}/bin/Hyprland";
+        user = "lukas";
+      };
+
+      default_session = {
+        command = "${pkgs.hyprland}/bin/Hyprland";
+        user = "lukas";
+      };
+    };
+  };
+
+}

modules/input/katana.nix

@@ -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

modules/networking/bluetooth.nix

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

modules/networking/networkmanager.nix

@@ -1,4 +1,3 @@
-{ config, pkgs, ... }:
 {
   networking.networkmanager.enable = true;
 }

modules/system/docker.nix

@@ -0,0 +1,3 @@
+{
+  virtualisation.docker.enable = true;
+}

modules/system/gpg.nix

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

modules/system/mullvad.nix

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

modules/system/virtualbox.nix

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

users/lukas.nix

@@ -1,14 +1,11 @@
-{ config, pkgs, ... }:
-
 {
   users.users.lukas = {
     isNormalUser = true;
     description = "lukas";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [ "networkmanager" "wheel" "docker"];
   };
 
   # Autologin
   services.displayManager.autoLogin.enable = true;
   services.displayManager.autoLogin.user = "lukas";
 }
-