From 5aa331ed3e05a1c429a0b6431b2257e122e8fec2 Mon Sep 17 00:00:00 2001 From: Kyattsukuro Date: Thu, 4 Jun 2026 14:41:38 +0200 Subject: [PATCH] cleander flakes --- eggs/fonts/.uuid | 1 - .../kde.org/UserFeedback.org.kde.dolphin.conf | 30 ---- eggs/kde_config/xsettingsd/xsettingsd.conf | 4 +- eggs/theme/gtk3/settings.ini | 4 +- eggs/theme/gtk4/settings.ini | 4 +- root-conf/nixos/flake.nix | 132 ++++++++++-------- root-conf/nixos/nixLap/configuration.nix | 2 - .../nixos/nixLjs/hardware-configuration.nix | 39 ++++++ root-conf/nixos/nixMain/configuration.nix | 2 - 9 files changed, 120 insertions(+), 98 deletions(-) delete mode 100644 eggs/fonts/.uuid delete mode 100644 eggs/kde_config/kde.org/UserFeedback.org.kde.dolphin.conf create mode 100644 root-conf/nixos/nixLjs/hardware-configuration.nix diff --git a/eggs/fonts/.uuid b/eggs/fonts/.uuid deleted file mode 100644 index 47b617ae..00000000 --- a/eggs/fonts/.uuid +++ /dev/null @@ -1 +0,0 @@ -99a339a3-e421-4c0c-8f9e-6fa8c82e54ab \ No newline at end of file diff --git a/eggs/kde_config/kde.org/UserFeedback.org.kde.dolphin.conf b/eggs/kde_config/kde.org/UserFeedback.org.kde.dolphin.conf deleted file mode 100644 index 8aabfd2d..00000000 --- a/eggs/kde_config/kde.org/UserFeedback.org.kde.dolphin.conf +++ /dev/null @@ -1,30 +0,0 @@ -[Source-applicationVersion] -dataSourceCommonSettings\activeState=true - -[Source-locale] -dataSourceCommonSettings\activeState=true - -[Source-places] -dataSourceCommonSettings\activeState=true - -[Source-platform] -dataSourceCommonSettings\activeState=true - -[Source-qtVersion] -dataSourceCommonSettings\activeState=true - -[Source-screens] -dataSourceCommonSettings\activeState=true - -[Source-settings] -dataSourceCommonSettings\activeState=true - -[Source-startCount] -dataSourceCommonSettings\activeState=true - -[Source-usageTime] -dataSourceCommonSettings\activeState=true - -[UserFeedback] -ApplicationStartCount=642 -ApplicationTime=1931897 diff --git a/eggs/kde_config/xsettingsd/xsettingsd.conf b/eggs/kde_config/xsettingsd/xsettingsd.conf index 63e22f36..b11d425c 100644 --- a/eggs/kde_config/xsettingsd/xsettingsd.conf +++ b/eggs/kde_config/xsettingsd/xsettingsd.conf @@ -1,6 +1,6 @@ Net/CursorBlinkTime 1000 Net/CursorBlink 1 -Gdk/UnscaledDPI 122880 +Gdk/UnscaledDPI 98304 Gdk/WindowScalingFactor 1 Gtk/EnableAnimations 1 Gtk/DecorationLayout "icon:minimize,maximize,close" @@ -8,7 +8,7 @@ Gtk/PrimaryButtonWarpsSlider 1 Gtk/ToolbarStyle 3 Gtk/MenuImages 1 Gtk/ButtonImages 1 -Gtk/CursorThemeSize 22 +Gtk/CursorThemeSize 24 Gtk/CursorThemeName "catppuccin-frappe-blue-cursors" Net/SoundThemeName "ocean" Net/IconThemeName "breeze-dark" diff --git a/eggs/theme/gtk3/settings.ini b/eggs/theme/gtk3/settings.ini index da55b581..45fdb72e 100755 --- a/eggs/theme/gtk3/settings.ini +++ b/eggs/theme/gtk3/settings.ini @@ -4,7 +4,7 @@ gtk-button-images=true gtk-cursor-blink=true gtk-cursor-blink-time=1000 gtk-cursor-theme-name=catppuccin-frappe-blue-cursors -gtk-cursor-theme-size=18 +gtk-cursor-theme-size=24 gtk-decoration-layout=icon:minimize,maximize,close gtk-enable-animations=true gtk-enable-event-sounds=1 @@ -19,6 +19,6 @@ gtk-theme-name=catppuccin-frappe-mauve-standard+default gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-toolbar-style=3 gtk-xft-antialias=1 -gtk-xft-dpi=122880 +gtk-xft-dpi=98304 gtk-xft-hinting=1 gtk-xft-hintstyle=hintfull diff --git a/eggs/theme/gtk4/settings.ini b/eggs/theme/gtk4/settings.ini index c9106706..3ec25f2f 100644 --- a/eggs/theme/gtk4/settings.ini +++ b/eggs/theme/gtk4/settings.ini @@ -3,7 +3,7 @@ gtk-application-prefer-dark-theme=true gtk-cursor-blink=true gtk-cursor-blink-time=1000 gtk-cursor-theme-name=catppuccin-frappe-blue-cursors -gtk-cursor-theme-size=18 +gtk-cursor-theme-size=24 gtk-decoration-layout=icon:minimize,maximize,close gtk-enable-animations=true gtk-font-name=Noto Sans, 10 @@ -11,4 +11,4 @@ gtk-icon-theme-name=breeze-dark gtk-modules=colorreload-gtk-module gtk-primary-button-warps-slider=true gtk-sound-theme-name=ocean -gtk-xft-dpi=122880 +gtk-xft-dpi=98304 diff --git a/root-conf/nixos/flake.nix b/root-conf/nixos/flake.nix index 378b9967..ae310adf 100644 --- a/root-conf/nixos/flake.nix +++ b/root-conf/nixos/flake.nix @@ -3,7 +3,9 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + pkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -13,80 +15,96 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + hyprland-split-monitor-workspaces = { url = "github:zjeffer/split-monitor-workspaces"; inputs.hyprland.follows = "hyprland"; }; - #hyprland-hyprspace = { - # url = "github:KZDKM/Hyprspace"; - # inputs.hyprland.follows = "hyprland"; - #}; + # hyprland-hyprspace = { + # url = "github:KZDKM/Hyprspace"; + # inputs.hyprland.follows = "hyprland"; + # }; }; - outputs = { self, nixpkgs, pkgs-unstable, home-manager, hyprland-split-monitor-workspaces, ... }@inputs: + outputs = { + self, + nixpkgs, + pkgs-unstable, + home-manager, + ... + } @ inputs: let system = "x86_64-linux"; - in { - nixosConfigurations.nixMain = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { - pkgs-unstable = import pkgs-unstable { inherit system; }; - inputs = inputs; - }; - modules = [ - ./nixMain/configuration.nix - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.users.someone = import ./nixMain/homemanager/someone.nix; - home-manager.extraSpecialArgs = {inherit inputs;}; - } - ]; - }; - nixosConfigurations.nixLap = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { - pkgs-unstable = import pkgs-unstable { inherit system; }; - inputs = inputs; - }; - modules = [ - ./nixLap/configuration.nix - ./nixLap/hardware-configuration.nix - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; + mkHost = + { + hostname, + configuration, + hardware ? null, + home, + }: + nixpkgs.lib.nixosSystem { + inherit system; - home-manager.users.someone = import ./nixLap/homemanager/someone.nix; - home-manager.extraSpecialArgs = {inherit inputs;}; - } - ]; - }; - nixosConfigurations.nixLjs = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { - pkgs-unstable = import pkgs-unstable { inherit system; }; - inputs = inputs; + specialArgs = { + inherit inputs; + pkgs-unstable = import pkgs-unstable { + inherit system; + }; }; - modules = [ - ./nixLap/configuration.nix - ./nixLjs/hardware-configuration.nix - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.users.someone = import ./nixLap/homemanager/someone.nix; - home-manager.extraSpecialArgs = {inherit inputs;}; - } - ]; + modules = + [ + { + networking.hostName = hostname; + } + + configuration + + home-manager.nixosModules.home-manager + + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + + home-manager.users.someone = import home; + + home-manager.extraSpecialArgs = { + inherit inputs; + }; + } + ] + ++ nixpkgs.lib.optional (hardware != null) hardware; + }; + in + { + nixosConfigurations = { + nixMain = mkHost { + hostname = "nixMain"; + configuration = ./nixMain/configuration.nix; + home = ./nixMain/homemanager/someone.nix; + }; + + nixLap = mkHost { + hostname = "nixLap"; + configuration = ./nixLap/configuration.nix; + hardware = ./nixLap/hardware-configuration.nix; + home = ./nixLap/homemanager/someone.nix; + }; + + nixLjs = mkHost { + hostname = "nixLjs"; + configuration = ./nixLap/configuration.nix; + hardware = ./nixLjs/hardware-configuration.nix; + home = ./nixLap/homemanager/someone.nix; + }; }; }; } diff --git a/root-conf/nixos/nixLap/configuration.nix b/root-conf/nixos/nixLap/configuration.nix index 800b9e78..89d7bac7 100644 --- a/root-conf/nixos/nixLap/configuration.nix +++ b/root-conf/nixos/nixLap/configuration.nix @@ -21,8 +21,6 @@ in "cryptd" ]; - networking.hostName = "nixLap"; - # Start the driver at boot systemd.services.fprintd = { wantedBy = [ "multi-user.target" ]; diff --git a/root-conf/nixos/nixLjs/hardware-configuration.nix b/root-conf/nixos/nixLjs/hardware-configuration.nix new file mode 100644 index 00000000..d544e50b --- /dev/null +++ b/root-conf/nixos/nixLjs/hardware-configuration.nix @@ -0,0 +1,39 @@ +# 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 = [ "nvme" "ehci_pci" "xhci_pci_renesas" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/mapper/cryptroot"; + fsType = "btrfs"; + }; + + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/baf64679-742e-4700-9e12-6bc9bc15617c"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/A2AF-FD4D"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [{ + device = "/dev/disk/by-label/swap"; + encrypted = { + enable = true; + label = "swap"; + blkDev = "/dev/disk/by-label/cryptoswap"; + }; + }]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/root-conf/nixos/nixMain/configuration.nix b/root-conf/nixos/nixMain/configuration.nix index befbc3ad..9c2f9acd 100644 --- a/root-conf/nixos/nixMain/configuration.nix +++ b/root-conf/nixos/nixMain/configuration.nix @@ -10,8 +10,6 @@ in ../shared-conf.nix ]; - networking.hostName = "nixMain"; # Define your hostname. - services.flatpak.enable = true; # Bootloader.