diff --git a/flake.nix b/flake.nix index 3da7fb1b..009536e6 100644 --- a/flake.nix +++ b/flake.nix @@ -33,11 +33,9 @@ outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path }: let - xdg-runtime-dir = "/tmp/xdg-rt"; - mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix { - inherit username home-dir prompt-color pkgs xdg-runtime-dir; + inherit username home-dir prompt-color pkgs; kak-pkg = kak.packages.${system}.kak; unispect = unispect.packages.${system}.unispect; @@ -45,10 +43,10 @@ unambig-path = unambig-path.packages.${system}.unambig-path; }; mkPC = {system, pkgs} : import ./home/graphical.nix { - inherit pkgs xdg-runtime-dir; + inherit pkgs; }; mkLaptop = {system, pkgs} : import ./home/apps.nix { - inherit pkgs xdg-runtime-dir; + inherit pkgs; }; mkDarwin = {system, pkgs}: import ./darwin.nix { diff --git a/home/apps.nix b/home/apps.nix index 5094d0c3..7ada859d 100644 --- a/home/apps.nix +++ b/home/apps.nix @@ -1,4 +1,4 @@ -{ pkgs, xdg-runtime-dir }: +{ pkgs }: { home.packages = with pkgs; [ discord-canary diff --git a/home/common.nix b/home/common.nix index 4a6886d3..38588701 100644 --- a/home/common.nix +++ b/home/common.nix @@ -1,4 +1,4 @@ -{ pkgs, username, home-dir, prompt-color, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }: +{ pkgs, username, home-dir, prompt-color, kak-pkg, unispect, ansi-utils, unambig-path }: let kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; }; @@ -49,10 +49,6 @@ in rec { # (extras.challtools python311Packages) ]; - home.sessionVariables = { - XDG_RUNTIME_DIR = xdg-runtime-dir; - }; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/home/graphical.nix b/home/graphical.nix index af72df44..8217bdb8 100644 --- a/home/graphical.nix +++ b/home/graphical.nix @@ -1,4 +1,4 @@ -{ pkgs, xdg-runtime-dir }: +{ pkgs }: let alacritty = import ./alacritty/alacritty.nix pkgs; diff --git a/nixos/kblayouts/fox-types.xkb b/nixos/kblayouts/fox-types.xkb deleted file mode 100644 index 61bb0b43..00000000 --- a/nixos/kblayouts/fox-types.xkb +++ /dev/null @@ -1,16 +0,0 @@ -xkb_types "noaltgr" { - virtual_modifiers Shift, Alt; - - type "CTRL+ALT" { - modifiers = Shift + Alt; - map[None] = Level1; - map[Shift] = Level2; - map[Alt] = Level3; - map[Shift+Alt] = Level4; - level_name[Level1] = "Base"; - level_name[Level2] = "Shift"; - level_name[Level3] = "Alt"; - level_name[Level4] = "Shift Alt"; - }; -}; -