From e7abe55a4201292ae8c42ffd385963af45c148c8 Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 4 Feb 2026 20:13:05 +0100 Subject: [PATCH 1/9] test --- flake.nix | 5 +- hosts/barbara-laptop/configuration.nix | 32 +++++++++ hosts/barbara-laptop/flakeConfiguration.nix | 72 +++++++++++++++++++ .../barbara-laptop/hardware-configuration.nix | 33 +++++++++ hosts/barbara-laptop/home.nix | 41 +++++++++++ hosts/barbara-laptop/mamas-packages.nix | 19 +++++ modules/home-manager/apps/config_files/katerc | 9 ++- .../home-manager/apps/config_files/okularrc | 41 +++++++---- .../apps/config_files/xournalpp_settings.xml | 18 +++-- .../wm/hyprland/hyprland_conf/input.nix | 4 ++ .../wm/hyprland/hyprland_conf/monitors.nix | 2 +- modules/system/basic/kernel.nix | 2 +- modules/system/hardware/automount.nix | 5 +- scripts/wallpaper/select_image.sh | 4 +- scripts/wallpaper/selected_image.txt | 2 +- 15 files changed, 259 insertions(+), 30 deletions(-) create mode 100644 hosts/barbara-laptop/configuration.nix create mode 100644 hosts/barbara-laptop/flakeConfiguration.nix create mode 100644 hosts/barbara-laptop/hardware-configuration.nix create mode 100644 hosts/barbara-laptop/home.nix create mode 100644 hosts/barbara-laptop/mamas-packages.nix diff --git a/flake.nix b/flake.nix index df6433c..db4b441 100644 --- a/flake.nix +++ b/flake.nix @@ -6,12 +6,13 @@ let inspiron-laptop = import ./hosts/inspiron-laptop/flakeConfiguration.nix inputs; zollsoft-mac = import ./hosts/zollsoft-mac/flakeConfiguration.nix inputs; + mamas-laptop = import ./hosts/barbara-laptop/flakeConfiguration.nix inputs; in { # insert other configurations by merging (need to be imported in let/in) - nixosConfigurations = inspiron-laptop; # // ; + nixosConfigurations = inspiron-laptop // mamas-laptop; # // ; darwinConfigurations = zollsoft-mac; # // ; - homeConfigurations = inspiron-laptop // zollsoft-mac; # // ; + homeConfigurations = inspiron-laptop // zollsoft-mac // mamas-laptop; # // ; }; inputs = { diff --git a/hosts/barbara-laptop/configuration.nix b/hosts/barbara-laptop/configuration.nix new file mode 100644 index 0000000..1f8da25 --- /dev/null +++ b/hosts/barbara-laptop/configuration.nix @@ -0,0 +1,32 @@ +{ inputs, ... }: + +{ + imports = [ + inputs.sops-nix.nixosModules.sops + ./hardware-configuration.nix + ../../modules/system/basic/kernel.nix + ../../modules/system/basic/locale.nix + ../../modules/system/basic/nh.nix + ../../modules/system/basic/settings.nix + ../../modules/system/basic/users.nix + ../../modules/system/apps/cli-apps.nix + ../../modules/system/apps/virtualisation.nix + ../../modules/system/boot/grub.nix + ../../modules/system/fonts/fonts.nix + ../../modules/system/hardware/accelerated_video_playback.nix + ../../modules/system/hardware/automount.nix + ../../modules/system/hardware/bluetooth.nix + ../../modules/system/hardware/intel.nix + ../../modules/system/hardware/networking.nix + ../../modules/system/hardware/pipewire.nix + ../../modules/system/hardware/printing.nix + ../../modules/system/security/remote.nix + ../../modules/system/security/location_information.nix + ../../modules/system/security/run_binaries.nix + ../../modules/system/wm/sddm.nix + ../../modules/system/wm/hyprland.nix + ../../modules/system/wm/kde.nix # home-managers qt theming (in theming.nix) will fuck up plasma6 so you need to disable it if you want to try plasma6 + ]; + + system.stateVersion = "23.11"; # Do not modify +} diff --git a/hosts/barbara-laptop/flakeConfiguration.nix b/hosts/barbara-laptop/flakeConfiguration.nix new file mode 100644 index 0000000..1cc22ab --- /dev/null +++ b/hosts/barbara-laptop/flakeConfiguration.nix @@ -0,0 +1,72 @@ +{ self, ... }@inputs: + +let + systemSettings = { + hostname = "mamas-laptop"; # hostname, unique identifier for building the flake + timezone = "Europe/Vienna"; # timezone + defaultLocale = "de_AT.UTF-8"; # default locale + extraLocale = "de_AT.UTF-8"; # extra locale (for measurement, numeric, time, ...) + kblayout = "de"; # keyboard layout + users = { + "1" = { + username = userSettings1.username; # username + name = userSettings1.name; + extraGroups = [ + "networkmanager" + "scanner" + "wheel" + "video" + "libvirtd" + ]; + }; + }; + }; + + userSettings1 = rec { + username = "barbara"; # username + name = "Leon"; # name/identifier (used for certain configurations i.e. git) + email = "leonvincenterd@web.de"; # email (used for certain configurations i.e. git) + flakeDirectory = "/home/${username}/dotfiles"; + kblayout = "de"; + systemConfigurationName = systemSettings.hostname; + userConfigurationName = "${username}@${systemConfigurationName}"; + isLinux = myPkgs.stdenv.isLinux; + }; + + myPkgs = import inputs.nixpkgs { + overlays = [ + inputs.nur.overlays.default + inputs.nix-vscode-extensions.overlays.default + (import ../../overlays) + ]; + system = "x86_64-linux"; # system arch (checkout hardware-configuration.nix -> nixpkgs.hostPlatform); + config.allowUnfree = true; + }; + + #pkgsLocal = import inputs.nixpkgsLocal { + # system = "x86_64-linux"; # system arch (checkout hardware-configuration.nix -> nixpkgs.hostPlatform); + # config.allowUnfree = true; + #}; +in + +{ + ${systemSettings.hostname} = inputs.nixpkgs.lib.nixosSystem { + modules = [ ./configuration.nix ]; + specialArgs = { + inherit inputs; + inherit myPkgs; + inherit systemSettings; + }; + }; + + ${userSettings1.userConfigurationName} = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = myPkgs; + modules = [ ./home.nix ]; + extraSpecialArgs = { + # pass config variables from above + inherit inputs; + userSettings = userSettings1; + #inherit pkgsLocal; + }; + }; +} diff --git a/hosts/barbara-laptop/hardware-configuration.nix b/hosts/barbara-laptop/hardware-configuration.nix new file mode 100644 index 0000000..b082438 --- /dev/null +++ b/hosts/barbara-laptop/hardware-configuration.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6f61779e-4fde-4c3b-a034-2fb20d952e98"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/CC93-2794"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/2d14d1e5-3db7-402c-a272-9a2d2e380106"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/barbara-laptop/home.nix b/hosts/barbara-laptop/home.nix new file mode 100644 index 0000000..9715dea --- /dev/null +++ b/hosts/barbara-laptop/home.nix @@ -0,0 +1,41 @@ +{ + lib, + inputs, + userSettings, + ... +}: + +{ + imports = [ + inputs.sops-nix.homeManagerModules.sops + ./mamas-packages.nix + ../../modules/home-manager/basic/basic.nix + ../../modules/home-manager/apps/office.nix + ../../modules/home-manager/apps/qt-apps.nix + ../../modules/home-manager/apps/social.nix + ../../modules/home-manager/apps/submodules/firefox.nix + ../../modules/home-manager/devel/alacritty.nix + ../../modules/home-manager/devel/shell + ../../modules/home-manager/devel/git.nix + ../../modules/home-manager/devel/vscode + ../../modules/home-manager/devel/wezterm.nix + ../../modules/home-manager/theming/theming.nix + ../../modules/home-manager/wm/hyprland # needs hyprland.nix import in configuration.nix + ../../modules/home-manager/wm/kde + ]; + + home.activation = { + myScripts = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + run ln -Tsf ${userSettings.flakeDirectory}/scripts ~/scripts + ''; + }; + + programs.firefox.profiles.${userSettings.username} = { + bookmarks = lib.mkForce { }; + }; + + services.network-manager-applet.enable = true; + services.blueman-applet.enable = true; + + home.stateVersion = "23.11"; # Do not modify +} diff --git a/hosts/barbara-laptop/mamas-packages.nix b/hosts/barbara-laptop/mamas-packages.nix new file mode 100644 index 0000000..a05d94b --- /dev/null +++ b/hosts/barbara-laptop/mamas-packages.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Halle Mama! Hier deine Packages untereinander hinschreiben und danach diesen Befehl ausführen im Terminal (Strg+Alt+T): "homie" + # Die Namen der packages findest du auf: https://search.nixos.org/packages?channel=unstable& + bitwarden-desktop + gimp + krita + handbrake + gthumb + mpv + qpwgraph + spotify + vlc + signal-desktop + kdePackages.audiocd-kio + ]; +} diff --git a/modules/home-manager/apps/config_files/katerc b/modules/home-manager/apps/config_files/katerc index 76c42ea..5976491 100644 --- a/modules/home-manager/apps/config_files/katerc +++ b/modules/home-manager/apps/config_files/katerc @@ -13,6 +13,7 @@ Mouse back button action=0 Mouse forward button action=0 Open New Tab To The Right Of Current=false Output History Limit=100 +PinnedDocuments= Recent File List Entry Count=10 Restore Window Configuration=true SDI Mode=false @@ -35,6 +36,9 @@ Tab Double Click New Document=true Tab Middle Click Close Document=true Tabbar Tab Limit=0 +[Icons] +Theme=Tela + [KTextEditor Document] Allow End of Line Detection=true Auto Detect Indent=true @@ -162,6 +166,7 @@ RunPrefix= SetEditor=false [MainWindow] +1536x960 screen: Window-Maximized=true 1920x1080 screen: Window-Maximized=true 3 screens: Height=1050 3 screens: Width=1680 @@ -172,12 +177,10 @@ ToolBarsMovable=Disabled [UiSettings] ColorScheme=LayanDark -[Icons] -Theme=Tela - [filetree] editShade=183,220,246 listMode=false +middleClickToClose=false shadingEnabled=true showCloseButton=false showFullPathOnRoots=false diff --git a/modules/home-manager/apps/config_files/okularrc b/modules/home-manager/apps/config_files/okularrc index c65e008..56c1614 100644 --- a/modules/home-manager/apps/config_files/okularrc +++ b/modules/home-manager/apps/config_files/okularrc @@ -1,27 +1,40 @@ [Desktop Entry] -FullScreen=false -shouldShowMenuBarComingFromFullScreen=true -shouldShowToolBarComingFromFullScreen=true +FullScreen=true +shouldShowMenuBarComingFromFullScreen=false +shouldShowToolBarComingFromFullScreen=false [General] LockSidebar=true ShowSidebar=true +[Icons] +Theme=Tela + [MainWindow] 3 screens: Window-Maximized=true -State=AAAA/wAAAAD9AAAAAQAAAAAAAABaAAADmfwCAAAAAfsAAAAcAG8AawB1AGwAYQByAF8AcwBpAGQAZQBiAGEAcgEAAABTAAADmQAAARUA///+AAACjwAAA5kAAAAEAAAABAAAAAgAAAAI/AAAAAMAAAABAAAAAQAAACwAcQB1AGkAYwBrAEEAbgBuAG8AdABhAHQAaQBvAG4AVABvAG8AbABCAGEAcgIAAAAA/////wAAAAAAAAAAAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAAAAAAAgAAAAEAAAAiAGEAbgBuAG8AdABhAHQAaQBvAG4AVABvAG8AbABCAGEAcgAAAAAA/////wAAAAAAAAAA -ToolBarsMovable=Disabled +MenuBar=Disabled [Recent Files] -File1[$e]=$HOME/Downloads/cv-martin-loeper.pdf -File2[$e]=$HOME/Downloads/pastedImage.png -File3[$e]=$HOME/Nextcloud/dotfiles/README.md -Name1[$e]=cv-martin-loeper.pdf -Name2[$e]=pastedImage.png -Name3[$e]=README.md +File1[$e]=$HOME/Downloads/pastedImage.png +File10[$e]=$HOME/Barbara/Rezepte/Kuchen, Cookies/CHEESECAKE AU POTIMARRON.pdf +File2[$e]=$HOME/Nextcloud/dotfiles/README.md +File3[$e]=$HOME/Downloads/Telegram Desktop/Assoziationsvertrag_KJ_TP (2)(1).pdf +File4[$e]=$HOME/Downloads/Telegram Desktop/Lebenslauf_Lena_Volmer (1).pdf +File5[$e]=$HOME/Downloads/BA gesamt_-teil II bis Kapitel 8.pdf +File6[$e]=$HOME/Downloads/BA ab Kaptel 8 _korr.pdf +File7[$e]=/run/media/barbara/ExternePlatte/Barbara/Reisen, Touren/1810-Silvretta-Runde-Broschuere_OL.pdf +File8[$e]=$HOME/Barbara/Reisen, Touren/1810-Silvretta-Runde-Broschuere_OL.pdf +File9[$e]=$HOME/Barbara/Rechnung/Rechnung NotebookPDF +Name1[$e]=pastedImage.png +Name10[$e]=CHEESECAKE AU POTIMARRON.pdf +Name2[$e]=README.md +Name3[$e]=Assoziationsvertrag_KJ_TP (2)(1).pdf +Name4[$e]=Lebenslauf_Lena_Volmer (1).pdf +Name5[$e]=BA gesamt_-teil II bis Kapitel 8.pdf +Name6[$e]=BA ab Kaptel 8 _korr.pdf +Name7[$e]=1810-Silvretta-Runde-Broschuere_OL.pdf +Name8[$e]=1810-Silvretta-Runde-Broschuere_OL.pdf +Name9[$e]=Rechnung NotebookPDF [UiSettings] ColorScheme=LayanDark - -[Icons] -Theme=Tela diff --git a/modules/home-manager/apps/config_files/xournalpp_settings.xml b/modules/home-manager/apps/config_files/xournalpp_settings.xml index b47ba05..72922d8 100644 --- a/modules/home-manager/apps/config_files/xournalpp_settings.xml +++ b/modules/home-manager/apps/config_files/xournalpp_settings.xml @@ -6,8 +6,8 @@ - - + + @@ -28,7 +28,7 @@ - + @@ -174,6 +174,14 @@ + + + + + + + + @@ -230,7 +238,7 @@ - + @@ -267,7 +275,7 @@ - + diff --git a/modules/home-manager/wm/hyprland/hyprland_conf/input.nix b/modules/home-manager/wm/hyprland/hyprland_conf/input.nix index bbbce9f..c9710b3 100644 --- a/modules/home-manager/wm/hyprland/hyprland_conf/input.nix +++ b/modules/home-manager/wm/hyprland/hyprland_conf/input.nix @@ -16,6 +16,10 @@ output = "eDP-1"; }; + cursor = { + no_hardware_cursors = 1; + }; + gesture = [ "3, horizontal, workspace" "3, vertical, scale:1.5, fullscreen" diff --git a/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix b/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix index 8f8ec0b..549ea2f 100644 --- a/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix +++ b/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix @@ -3,6 +3,6 @@ { wayland.windowManager.hyprland.settings = { # Fallback rule - monitor = ", preferred, auto, 1"; + monitor = ", preferred, auto, 1.25"; }; } diff --git a/modules/system/basic/kernel.nix b/modules/system/basic/kernel.nix index f5a88d3..fb8af88 100644 --- a/modules/system/basic/kernel.nix +++ b/modules/system/basic/kernel.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages; + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/modules/system/hardware/automount.nix b/modules/system/hardware/automount.nix index fdc5da0..26b2999 100644 --- a/modules/system/hardware/automount.nix +++ b/modules/system/hardware/automount.nix @@ -1,7 +1,10 @@ -{ ... }: +{ pkgs, ... }: { services.devmon.enable = true; services.gvfs.enable = true; services.udisks2.enable = true; + environment.systemPackages = with pkgs; [ + ntfs3g + ]; } diff --git a/scripts/wallpaper/select_image.sh b/scripts/wallpaper/select_image.sh index db9feac..3d277c2 100755 --- a/scripts/wallpaper/select_image.sh +++ b/scripts/wallpaper/select_image.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -img_folder="$HOME/Nextcloud/Pictures/Geordnet" +img_folder="$HOME/Bilder/Wallpaper" # Extract the directory part of the script script_path="$(realpath "$0")" @@ -32,4 +32,4 @@ while true; do break fi fi -done \ No newline at end of file +done diff --git a/scripts/wallpaper/selected_image.txt b/scripts/wallpaper/selected_image.txt index 386fbcd..76594cb 100644 --- a/scripts/wallpaper/selected_image.txt +++ b/scripts/wallpaper/selected_image.txt @@ -1 +1 @@ -/home/leon/scripts/wallpaper/wallpaper.jpg +/home/barbara/Bilder/Wallpaper/IMG_2043.jpeg From 12383a472be5fde34b2adb790517e1b7d82d4554 Mon Sep 17 00:00:00 2001 From: Leon Erd Date: Thu, 5 Feb 2026 18:55:45 +0100 Subject: [PATCH 2/9] change name --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index db4b441..72635fa 100644 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,13 @@ let inspiron-laptop = import ./hosts/inspiron-laptop/flakeConfiguration.nix inputs; zollsoft-mac = import ./hosts/zollsoft-mac/flakeConfiguration.nix inputs; - mamas-laptop = import ./hosts/barbara-laptop/flakeConfiguration.nix inputs; + barbara-laptop = import ./hosts/barbara-laptop/flakeConfiguration.nix inputs; in { # insert other configurations by merging (need to be imported in let/in) - nixosConfigurations = inspiron-laptop // mamas-laptop; # // ; + nixosConfigurations = inspiron-laptop // barbara-laptop; # // ; darwinConfigurations = zollsoft-mac; # // ; - homeConfigurations = inspiron-laptop // zollsoft-mac // mamas-laptop; # // ; + homeConfigurations = inspiron-laptop // zollsoft-mac // barbara-laptop; # // ; }; inputs = { From 1b9c3578beeda113c16a86a2d4fa0aee6529fef0 Mon Sep 17 00:00:00 2001 From: Leon Erd Date: Thu, 5 Feb 2026 18:56:04 +0100 Subject: [PATCH 3/9] revert kernel changes --- hosts/barbara-laptop/configuration.nix | 5 +++-- modules/system/basic/kernel.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/barbara-laptop/configuration.nix b/hosts/barbara-laptop/configuration.nix index 1f8da25..93b30c5 100644 --- a/hosts/barbara-laptop/configuration.nix +++ b/hosts/barbara-laptop/configuration.nix @@ -1,10 +1,9 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix - ../../modules/system/basic/kernel.nix ../../modules/system/basic/locale.nix ../../modules/system/basic/nh.nix ../../modules/system/basic/settings.nix @@ -28,5 +27,7 @@ ../../modules/system/wm/kde.nix # home-managers qt theming (in theming.nix) will fuck up plasma6 so you need to disable it if you want to try plasma6 ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + system.stateVersion = "23.11"; # Do not modify } diff --git a/modules/system/basic/kernel.nix b/modules/system/basic/kernel.nix index fb8af88..f5a88d3 100644 --- a/modules/system/basic/kernel.nix +++ b/modules/system/basic/kernel.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages; } From cf7f0b83ed8ff8f392d2074da14c09fa324f4931 Mon Sep 17 00:00:00 2001 From: Leon Erd Date: Thu, 5 Feb 2026 19:09:24 +0100 Subject: [PATCH 4/9] revert config_files changes --- modules/home-manager/apps/config_files/katerc | 9 ++-- .../home-manager/apps/config_files/okularrc | 41 +++++++------------ .../apps/config_files/xournalpp_settings.xml | 18 +++----- 3 files changed, 22 insertions(+), 46 deletions(-) diff --git a/modules/home-manager/apps/config_files/katerc b/modules/home-manager/apps/config_files/katerc index 5976491..76c42ea 100644 --- a/modules/home-manager/apps/config_files/katerc +++ b/modules/home-manager/apps/config_files/katerc @@ -13,7 +13,6 @@ Mouse back button action=0 Mouse forward button action=0 Open New Tab To The Right Of Current=false Output History Limit=100 -PinnedDocuments= Recent File List Entry Count=10 Restore Window Configuration=true SDI Mode=false @@ -36,9 +35,6 @@ Tab Double Click New Document=true Tab Middle Click Close Document=true Tabbar Tab Limit=0 -[Icons] -Theme=Tela - [KTextEditor Document] Allow End of Line Detection=true Auto Detect Indent=true @@ -166,7 +162,6 @@ RunPrefix= SetEditor=false [MainWindow] -1536x960 screen: Window-Maximized=true 1920x1080 screen: Window-Maximized=true 3 screens: Height=1050 3 screens: Width=1680 @@ -177,10 +172,12 @@ ToolBarsMovable=Disabled [UiSettings] ColorScheme=LayanDark +[Icons] +Theme=Tela + [filetree] editShade=183,220,246 listMode=false -middleClickToClose=false shadingEnabled=true showCloseButton=false showFullPathOnRoots=false diff --git a/modules/home-manager/apps/config_files/okularrc b/modules/home-manager/apps/config_files/okularrc index 56c1614..c65e008 100644 --- a/modules/home-manager/apps/config_files/okularrc +++ b/modules/home-manager/apps/config_files/okularrc @@ -1,40 +1,27 @@ [Desktop Entry] -FullScreen=true -shouldShowMenuBarComingFromFullScreen=false -shouldShowToolBarComingFromFullScreen=false +FullScreen=false +shouldShowMenuBarComingFromFullScreen=true +shouldShowToolBarComingFromFullScreen=true [General] LockSidebar=true ShowSidebar=true -[Icons] -Theme=Tela - [MainWindow] 3 screens: Window-Maximized=true -MenuBar=Disabled +State=AAAA/wAAAAD9AAAAAQAAAAAAAABaAAADmfwCAAAAAfsAAAAcAG8AawB1AGwAYQByAF8AcwBpAGQAZQBiAGEAcgEAAABTAAADmQAAARUA///+AAACjwAAA5kAAAAEAAAABAAAAAgAAAAI/AAAAAMAAAABAAAAAQAAACwAcQB1AGkAYwBrAEEAbgBuAG8AdABhAHQAaQBvAG4AVABvAG8AbABCAGEAcgIAAAAA/////wAAAAAAAAAAAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAAAAAAAgAAAAEAAAAiAGEAbgBuAG8AdABhAHQAaQBvAG4AVABvAG8AbABCAGEAcgAAAAAA/////wAAAAAAAAAA +ToolBarsMovable=Disabled [Recent Files] -File1[$e]=$HOME/Downloads/pastedImage.png -File10[$e]=$HOME/Barbara/Rezepte/Kuchen, Cookies/CHEESECAKE AU POTIMARRON.pdf -File2[$e]=$HOME/Nextcloud/dotfiles/README.md -File3[$e]=$HOME/Downloads/Telegram Desktop/Assoziationsvertrag_KJ_TP (2)(1).pdf -File4[$e]=$HOME/Downloads/Telegram Desktop/Lebenslauf_Lena_Volmer (1).pdf -File5[$e]=$HOME/Downloads/BA gesamt_-teil II bis Kapitel 8.pdf -File6[$e]=$HOME/Downloads/BA ab Kaptel 8 _korr.pdf -File7[$e]=/run/media/barbara/ExternePlatte/Barbara/Reisen, Touren/1810-Silvretta-Runde-Broschuere_OL.pdf -File8[$e]=$HOME/Barbara/Reisen, Touren/1810-Silvretta-Runde-Broschuere_OL.pdf -File9[$e]=$HOME/Barbara/Rechnung/Rechnung NotebookPDF -Name1[$e]=pastedImage.png -Name10[$e]=CHEESECAKE AU POTIMARRON.pdf -Name2[$e]=README.md -Name3[$e]=Assoziationsvertrag_KJ_TP (2)(1).pdf -Name4[$e]=Lebenslauf_Lena_Volmer (1).pdf -Name5[$e]=BA gesamt_-teil II bis Kapitel 8.pdf -Name6[$e]=BA ab Kaptel 8 _korr.pdf -Name7[$e]=1810-Silvretta-Runde-Broschuere_OL.pdf -Name8[$e]=1810-Silvretta-Runde-Broschuere_OL.pdf -Name9[$e]=Rechnung NotebookPDF +File1[$e]=$HOME/Downloads/cv-martin-loeper.pdf +File2[$e]=$HOME/Downloads/pastedImage.png +File3[$e]=$HOME/Nextcloud/dotfiles/README.md +Name1[$e]=cv-martin-loeper.pdf +Name2[$e]=pastedImage.png +Name3[$e]=README.md [UiSettings] ColorScheme=LayanDark + +[Icons] +Theme=Tela diff --git a/modules/home-manager/apps/config_files/xournalpp_settings.xml b/modules/home-manager/apps/config_files/xournalpp_settings.xml index 72922d8..b47ba05 100644 --- a/modules/home-manager/apps/config_files/xournalpp_settings.xml +++ b/modules/home-manager/apps/config_files/xournalpp_settings.xml @@ -6,8 +6,8 @@ - - + + @@ -28,7 +28,7 @@ - + @@ -174,14 +174,6 @@ - - - - - - - - @@ -238,7 +230,7 @@ - + @@ -275,7 +267,7 @@ - + From 494b9ee644ff42ba8c784f990bfbdafe3fc3e0d1 Mon Sep 17 00:00:00 2001 From: Leon Erd Date: Thu, 5 Feb 2026 19:10:03 +0100 Subject: [PATCH 5/9] fix indentation --- hosts/barbara-laptop/mamas-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/barbara-laptop/mamas-packages.nix b/hosts/barbara-laptop/mamas-packages.nix index a05d94b..fa9b4b3 100644 --- a/hosts/barbara-laptop/mamas-packages.nix +++ b/hosts/barbara-laptop/mamas-packages.nix @@ -15,5 +15,5 @@ vlc signal-desktop kdePackages.audiocd-kio - ]; + ]; } From 4c897e8995d35cee7def3310c6976a7f5abb91f9 Mon Sep 17 00:00:00 2001 From: Leon Date: Thu, 5 Feb 2026 22:06:13 +0100 Subject: [PATCH 6/9] monitor scaling from module -> home file --- hosts/barbara-laptop/home.nix | 5 +++++ modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/barbara-laptop/home.nix b/hosts/barbara-laptop/home.nix index 9715dea..6726a75 100644 --- a/hosts/barbara-laptop/home.nix +++ b/hosts/barbara-laptop/home.nix @@ -37,5 +37,10 @@ services.network-manager-applet.enable = true; services.blueman-applet.enable = true; + wayland.windowManager.hyprland.settings = { + # Fallback rule + monitor = lib.mkForce ", preferred, auto, 1.25"; + }; + home.stateVersion = "23.11"; # Do not modify } diff --git a/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix b/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix index 549ea2f..8f8ec0b 100644 --- a/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix +++ b/modules/home-manager/wm/hyprland/hyprland_conf/monitors.nix @@ -3,6 +3,6 @@ { wayland.windowManager.hyprland.settings = { # Fallback rule - monitor = ", preferred, auto, 1.25"; + monitor = ", preferred, auto, 1"; }; } From a288c8078110bb3fa23a3f233be096cbd5e36fca Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 11 Feb 2026 17:15:34 +0100 Subject: [PATCH 7/9] undo selected_image change --- scripts/wallpaper/selected_image.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wallpaper/selected_image.txt b/scripts/wallpaper/selected_image.txt index 76594cb..386fbcd 100644 --- a/scripts/wallpaper/selected_image.txt +++ b/scripts/wallpaper/selected_image.txt @@ -1 +1 @@ -/home/barbara/Bilder/Wallpaper/IMG_2043.jpeg +/home/leon/scripts/wallpaper/wallpaper.jpg From c1d81d526cfa452f66fde161aa7f1f5ec28cf939 Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 11 Feb 2026 17:19:44 +0100 Subject: [PATCH 8/9] undo select_image.sh changes --- scripts/wallpaper/select_image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/wallpaper/select_image.sh b/scripts/wallpaper/select_image.sh index 3d277c2..db9feac 100755 --- a/scripts/wallpaper/select_image.sh +++ b/scripts/wallpaper/select_image.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -img_folder="$HOME/Bilder/Wallpaper" +img_folder="$HOME/Nextcloud/Pictures/Geordnet" # Extract the directory part of the script script_path="$(realpath "$0")" @@ -32,4 +32,4 @@ while true; do break fi fi -done +done \ No newline at end of file From fa765042ffeebe3dd70324ada0c3d6ab0114b059 Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 11 Feb 2026 17:24:35 +0100 Subject: [PATCH 9/9] correctly format hardware-configuration.nix --- .../barbara-laptop/hardware-configuration.nix | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/hosts/barbara-laptop/hardware-configuration.nix b/hosts/barbara-laptop/hardware-configuration.nix index b082438..f071590 100644 --- a/hosts/barbara-laptop/hardware-configuration.nix +++ b/hosts/barbara-laptop/hardware-configuration.nix @@ -1,32 +1,47 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/6f61779e-4fde-4c3b-a034-2fb20d952e98"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/6f61779e-4fde-4c3b-a034-2fb20d952e98"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CC93-2794"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/2d14d1e5-3db7-402c-a272-9a2d2e380106"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/CC93-2794"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/2d14d1e5-3db7-402c-a272-9a2d2e380106"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;