From 680fed13f76ee778bf8647038226268ebeddd73a Mon Sep 17 00:00:00 2001 From: KeksNino Date: Sat, 4 Jul 2026 20:53:06 +0200 Subject: [PATCH] disable fish_greeting, install klassy and add xremap --- configuration.nix | 9 ---- flake.lock | 103 +++++++++++++++++++++++++++++++++++++ flake.nix | 26 ++++++++-- hardware-configuration.nix | 7 ++- home-manager/home.nix | 1 + packages.nix | 1 + 6 files changed, 134 insertions(+), 13 deletions(-) diff --git a/configuration.nix b/configuration.nix index 5cc57a0..8ef5aaa 100644 --- a/configuration.nix +++ b/configuration.nix @@ -27,7 +27,6 @@ boot.kernelParams = [ "iomem=relaxed" - "quiet" "iommu=pt" "amd_iommu=on" "kvm.ignore_msrs=1" @@ -64,7 +63,6 @@ LC_TIME = "de_DE.UTF-8"; }; - # Configure console keymap console.keyMap = "de"; programs.fish.enable = true; @@ -94,14 +92,9 @@ }; boot.supportedFilesystems = [ "nfs4" ]; - environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; qt = { enable = true; platformTheme = "qt5ct"; - # style = { - # package = pkgs.klassy; - # name = "Klassy"; - # }; }; services.goxlr-utility.enable = true; @@ -114,8 +107,6 @@ security.rtkit.enable = true; systemd.services."rtkit-daemon".enable = true; - environment.systemPackages = with pkgs; [ ]; - nixpkgs.config.permittedInsecurePackages = [ "electron-39.8.10" ]; diff --git a/flake.lock b/flake.lock index 2fb96a5..ca02af5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "crane": { + "locked": { + "lastModified": 1766774972, + "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "discord-music-presence": { "inputs": { "nixpkgs": "nixpkgs" @@ -51,6 +66,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -87,6 +120,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1782328929, @@ -102,15 +150,70 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "discord-music-presence": "discord-music-presence", "dms": "dms", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", + "xremap-flake": "xremap-flake", "zen-browser": "zen-browser" } }, + "xremap": { + "flake": false, + "locked": { + "lastModified": 1782465938, + "narHash": "sha256-BgRp0y5bkmMwRCdIKHrXIbv6Kl7Hn9IphburN7i7sE8=", + "owner": "k0kubun", + "repo": "xremap", + "rev": "6d1d06436ecd54002257029bc26a22ef058d4b63", + "type": "github" + }, + "original": { + "owner": "k0kubun", + "ref": "v0.15.9", + "repo": "xremap", + "type": "github" + } + }, + "xremap-flake": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_3", + "xremap": "xremap" + }, + "locked": { + "lastModified": 1782757039, + "narHash": "sha256-4CuFwWsQxoNY4Cxz4+GVEmRrMTR5dUOTKN2eNk1KiEI=", + "owner": "xremap", + "repo": "nix-flake", + "rev": "7f161bede2961279dfde194add6aa53d80a9d26d", + "type": "github" + }, + "original": { + "owner": "xremap", + "repo": "nix-flake", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 974c660..249c4dc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; - # hyprland.url = "github:hyprwm/Hyprland"; zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,10 +16,11 @@ url = "github:AvengeMedia/DankMaterialShell"; inputs.nixpkgs.follows = "nixpkgs"; }; + xremap-flake.url = "github:xremap/nix-flake"; }; outputs = - { self, zen-browser, discord-music-presence, ... }@inputs: + { self, zen-browser, discord-music-presence, xremap-flake, ... }@inputs: let system = "x86_64-linux"; inherit (inputs) nixpkgs; @@ -34,6 +34,7 @@ ./configuration.nix ./hardware-configuration.nix inputs.home-manager.nixosModules.home-manager + inputs.xremap-flake.nixosModules.default { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -44,7 +45,26 @@ home-manager.backupFileExtension = "backup"; - # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix + # xremap + services.xremap.enable = true; + services.xremap.withHypr = true; + + services.xremap.config.modmap = [ + { + name = "Global"; + remap = { "CapsLock" = "Esc"; }; + } + ]; + + services.xremap.config.keymap = [ + { + name = "curly braces"; + remap = { "KEY_SEMICOLON" = "RIGHTALT-KEY_7"; }; # ä -> } + remap = { "KEY_APOSTROPHE" = "RIGHTALT-KEY_0"; }; # ö -> { + remap = { "RIGHTALT-KEY_A" = "KEY_APOSTROPHE"; }; # altgr + a -> ä + remap = { "RIGHTALT-KEY_W" = "KEY_SEMICOLON"; }; # altgr + w -> ö + } + ]; } ( let diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 4dc4871..4740a4e 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -14,7 +14,7 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/3bf12238-0a1b-4d18-9cf0-a06209368e76"; + { device = "/dev/disk/by-uuid/ddabcce9-86a5-4dd8-84f1-3afa99a83752"; fsType = "ext4"; }; @@ -39,6 +39,11 @@ fsType = "ext4"; }; + fileSystems."/media/gamedisk" = + { device = "/dev/disk/by-uuid/5C7C14707C1446E4"; + fsType = "ntfs3"; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/5949c73f-30eb-4956-9e93-70301c88fad8"; } ]; diff --git a/home-manager/home.nix b/home-manager/home.nix index 8da436e..9902e02 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -77,6 +77,7 @@ in nitch set -gx EDITOR nvim set -g fish_key_bindings fish_hybrid_key_bindings + set fish_greeting ''; }; diff --git a/packages.nix b/packages.nix index 090db68..e9d443e 100644 --- a/packages.nix +++ b/packages.nix @@ -29,5 +29,6 @@ lsof gcc picard + klassy ]; }