From ebe65dc10802e4afc2fb06a6f9c9fa7402036765 Mon Sep 17 00:00:00 2001 From: zastian-dev Date: Thu, 11 Dec 2025 14:48:22 +0000 Subject: [PATCH] stuff IDK --- configuration.nix | 29 +--- flake.lock | 312 ++-------------------------------------- flake.nix | 4 - home/homePkgs.nix | 2 +- system/inputMethods.nix | 51 +++---- system/nixOSPkgs.nix | 3 +- 6 files changed, 36 insertions(+), 365 deletions(-) diff --git a/configuration.nix b/configuration.nix index c9a334f..61cbb55 100755 --- a/configuration.nix +++ b/configuration.nix @@ -26,6 +26,7 @@ in ./system/boot.nix ./system/network.nix ./system/inputMethods.nix + ./system/hardware.nix ./system/fonts.nix inputs.home-manager.nixosModules.home-manager #inputs.niri.nixosModules.niri @@ -187,33 +188,6 @@ in }; }; - #boot.loader.systemd-boot.sortKey = lib.mkForce "00000000001-steam"; - hardware.graphics = { - enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ - libva - libva-vdpau-driver - libvdpau-va-gl - - ]; - }; - # ── Bluetooth ──────────────────────────────────────────────────────────────── - hardware.bluetooth = { - enable = true; # Enable Bluetooth support - powerOnBoot = true; # Power up controller on boot - settings.General = { - #Enable = "Source,Sink,Media,Socket"; - # Experimental = true; - }; - }; - - # ── Tablets ───────────────────────────────────────────────────────────────── - hardware.enableRedistributableFirmware = true; - hardware.firmware = [ - pkgs.linux-firmware - ]; - environment = { systemPackages = with pkgs; [ mangohud @@ -261,7 +235,6 @@ in ############################################################################## imports = [ ./system/services.nix - ./system/hardware.nix ./system/nixOSPkgs.nix #inputs.niri.nixosModules.niri ]; diff --git a/flake.lock b/flake.lock index 5f7da97..75e5f7e 100644 --- a/flake.lock +++ b/flake.lock @@ -33,39 +33,6 @@ "type": "github" } }, - "aquamarine_2": { - "inputs": { - "hyprutils": [ - "hyprlauncher", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprlauncher", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -473,35 +440,6 @@ "type": "github" } }, - "hyprgraphics_2": { - "inputs": { - "hyprutils": [ - "hyprlauncher", - "hyprutils" - ], - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -521,11 +459,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765319435, - "narHash": "sha256-9EU73XoTJNYiflVFDeplxE6BhAVg4TGPdiB4vbdJmXQ=", + "lastModified": 1765456802, + "narHash": "sha256-KAwcM3w98TxiGlBnWYxhTdHM1vZZhzeeXaEE647REZ0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f58c80fd3942034d58934ec4e4d93bfcfa3c786e", + "rev": "2ca7ad7efc1e20588af5c823ee46f23afad6cf91", "type": "github" }, "original": { @@ -685,95 +623,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprlauncher", - "hyprutils" - ], - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_3": { - "inputs": { - "hyprutils": [ - "hyprlauncher", - "hyprtoolkit", - "hyprutils" - ], - "nixpkgs": [ - "hyprlauncher", - "hyprtoolkit", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "hyprtoolkit", - "systems" - ] - }, - "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlauncher": { - "inputs": { - "aquamarine": "aquamarine_2", - "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_2", - "hyprtoolkit": "hyprtoolkit_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "hyprwire": "hyprwire_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1765324959, - "narHash": "sha256-Odz0We13yF+cHNeymyy1Xx+1fVg6f/oi8BWQZ+Qwyl4=", - "owner": "hyprwm", - "repo": "hyprlauncher", - "rev": "e380fdc517aacdf93a60a8ac648e88eda5e499cd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlauncher", - "type": "github" - } - }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -826,48 +675,6 @@ "type": "github" } }, - "hyprtoolkit_2": { - "inputs": { - "aquamarine": [ - "hyprlauncher", - "aquamarine" - ], - "hyprgraphics": [ - "hyprlauncher", - "hyprgraphics" - ], - "hyprlang": "hyprlang_3", - "hyprutils": [ - "hyprlauncher", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprlauncher", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1762779491, - "narHash": "sha256-M+mlYKvzqW+TSoJ4MH9U+HcFoUmWc1etiXehyLEVB2M=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "2af07d3fd4d165caee160aab96810c54d81e88c2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -893,31 +700,6 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1762812168, - "narHash": "sha256-pY+dUqi2AYpH0HHT2JFzt1qWoJQBWtBdzzcL1ZK5Mwo=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "cb3e797fde5c748164eb70d9859336141136a166", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -943,31 +725,6 @@ "type": "github" } }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "hyprwire": { "inputs": { "hyprutils": [ @@ -997,35 +754,6 @@ "type": "github" } }, - "hyprwire_2": { - "inputs": { - "hyprutils": [ - "hyprlauncher", - "hyprutils" - ], - "nixpkgs": [ - "hyprlauncher", - "nixpkgs" - ], - "systems": [ - "hyprlauncher", - "systems" - ] - }, - "locked": { - "lastModified": 1761653508, - "narHash": "sha256-EoLyrxFJVr7igDhhVNRk2rRpEEOJllRWvYg5XZ3J5y0=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "a5946085ab7705d7b75b77a91ce8fca7faf0dc34", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "nix-alien": { "inputs": { "flake-compat": "flake-compat_2", @@ -1132,11 +860,11 @@ ] }, "locked": { - "lastModified": 1765354228, - "narHash": "sha256-T0AjQ6GsUISIk2wTWl1DO2MGub2KiGaiivegmFQ4C8Q=", + "lastModified": 1765440299, + "narHash": "sha256-pFbREAtYotjEo059YRGsjn9+nOLuwuOEJQ9cOV9Kc5g=", "owner": "kaylorben", "repo": "nixcord", - "rev": "38760fd1451b7a25cd151839b173c3996918f375", + "rev": "a68a319cbca0915da385b36b11f5aa2df8cf6e7a", "type": "github" }, "original": { @@ -1394,7 +1122,6 @@ "hyprland": "hyprland", "hyprland-hyprsplit": "hyprland-hyprsplit", "hyprland-plugins": "hyprland-plugins", - "hyprlauncher": "hyprlauncher", "nix-alien": "nix-alien", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database_2", @@ -1418,7 +1145,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1455,21 +1182,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1484,7 +1196,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1583,7 +1295,7 @@ "vicinae": { "inputs": { "nixpkgs": "nixpkgs_5", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1765272078, @@ -1650,11 +1362,11 @@ ] }, "locked": { - "lastModified": 1765344150, - "narHash": "sha256-RoGBKQglbF19aINeV8F7DHCXxF7FrMRLgL2yjl9vOiQ=", + "lastModified": 1765430623, + "narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1adab25828578301037855c59849e9bbecf8948b", + "rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2782dc3..80b53fc 100755 --- a/flake.nix +++ b/flake.nix @@ -51,10 +51,6 @@ inputs = { url = "github:Duckonaut/split-monitor-workspaces"; inputs.hyprland.follows = "hyprland"; }; - hyprlauncher = { - url = "github:hyprwm/hyprlauncher"; - inputs.nixpkgs.follows = "nixpkgs"; - }; vicinae = { url = "github:vicinaehq/vicinae"; #inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/homePkgs.nix b/home/homePkgs.nix index c0f2dbb..4a0fc1b 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -274,7 +274,7 @@ in # Experimental (inputs) ############################ #inputs.ladybird.packages."${pkgs.system}".ladybird - inputs.hyprlauncher.packages.${pkgs.system}.default + #inputs.hyprlauncher.packages.${pkgs.system}.default ############################ # Blockchain (inputs) diff --git a/system/inputMethods.nix b/system/inputMethods.nix index d3d2c64..554a111 100755 --- a/system/inputMethods.nix +++ b/system/inputMethods.nix @@ -1,37 +1,26 @@ { config, lib, pkgs, systemName, ... }: { - console.keyMap = "ie"; + # Set console keymap based on systemName + console.keyMap = if systemName == "laptop" then "ie" else "us"; - i18n = lib.mkMerge [ - (lib.mkIf (systemName == "laptop") { - defaultLocale = "en_IE.UTF-8"; - extraLocaleSettings = { - LC_ADDRESS = "en_IE.UTF-8"; - LC_IDENTIFICATION = "en_IE.UTF-8"; - LC_MEASUREMENT = "en_IE.UTF-8"; - LC_MONETARY = "en_IE.UTF-8"; - LC_NAME = "en_IE.UTF-8"; - LC_NUMERIC = "en_IE.UTF-8"; - LC_PAPER = "en_IE.UTF-8"; - LC_TELEPHONE = "en_IE.UTF-8"; - LC_TIME = "en_IE.UTF-8"; - }; - }) + # Locale settings + i18n.defaultLocale = + if systemName == "laptop" + then "en_IE.UTF-8" + else "en_US.UTF-8"; - (lib.mkIf (systemName == "pc") { - defaultLocale = "en_US.UTF-8"; - extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - }) - ]; + i18n.extraLocaleSettings = let + locale = if systemName == "laptop" then "en_IE.UTF-8" else "en_US.UTF-8"; + in { + LC_ADDRESS = locale; + LC_IDENTIFICATION = locale; + LC_MEASUREMENT = locale; + LC_MONETARY = locale; + LC_NAME = locale; + LC_NUMERIC = locale; + LC_PAPER = locale; + LC_TELEPHONE = locale; + LC_TIME = locale; + }; } diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 6964a85..5a04487 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -131,6 +131,7 @@ in nix-ld = { enable = true; libraries = with pkgs; [ + gcc15.cc.lib # add libraries here if needed # alsa-lib # libGL @@ -194,7 +195,7 @@ in # --- Development toolchains --- cmake - gcc + gcc15 gnumake jdk11 ladspaPlugins