diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..b44acd7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +flake.lock -diff diff --git a/flake.lock b/flake.lock index 59306d9..207df2d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "catppuccin-toolbox": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1674285238, - "narHash": "sha256-Rpop0YFk7fpsTL8QdCMq7EB8uc5eRTdHGH8yo0sAvFU=", - "owner": "catppuccin", - "repo": "toolbox", - "rev": "bbd81b470c28defdddd958dd3860b59ae7d81739", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "toolbox", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -56,21 +37,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -85,7 +51,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -145,7 +111,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "wlroots": "wlroots", "xdph": "xdph" }, @@ -186,7 +152,7 @@ }, "nekowinston-nur": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1676351500, @@ -204,11 +170,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673631141, - "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "type": "github" }, "original": { @@ -267,22 +233,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1675273418, - "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -298,7 +248,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1676375384, "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=", @@ -314,7 +264,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -330,7 +280,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -364,9 +314,9 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -385,13 +335,12 @@ }, "root": { "inputs": { - "catppuccin-toolbox": "catppuccin-toolbox", "darwin": "darwin", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "home-manager": "home-manager", "hyprland": "hyprland", "nekowinston-nur": "nekowinston-nur", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", @@ -400,7 +349,7 @@ }, "sops": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 28d34b1..f49af4f 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,6 @@ }; nur.url = "github:nix-community/NUR"; nekowinston-nur.url = "github:nekowinston/nur"; - catppuccin-toolbox.url = "github:catppuccin/toolbox"; sops.url = "github:Mic92/sops-nix"; # dev @@ -28,7 +27,6 @@ outputs = { self, - catppuccin-toolbox, darwin, flake-utils, home-manager, @@ -41,7 +39,7 @@ sops, ... }: let - overlay-unstable = final: prev: { + overlays = final: prev: { unstable = import nixpkgs-unstable { system = prev.system; config.allowUnfree = true; @@ -64,23 +62,16 @@ ({config, ...}: { config = { - nixpkgs.overlays = [ - overlay-unstable - ]; + nixpkgs.overlays = [overlays]; nixpkgs.config.allowUnfree = true; home-manager = { useGlobalPkgs = true; - users.winston.imports = [ - ./home.nix - { - home.packages = [ - catppuccin-toolbox.packages.${system}.catwalk - ]; - } + sharedModules = [ + sops.homeManagerModules.sops + hyprland.homeManagerModules.default ]; + users.winston.imports = [./home.nix]; extraSpecialArgs = { - sops = sops.homeManagerModules.sops; - hyprland = hyprland.homeManagerModules.default; flakePath = "/home/winston/.config/nixpkgs"; machine.personal = true; }; @@ -101,28 +92,20 @@ ({config, ...}: { config = { - nixpkgs.overlays = [ - overlay-unstable - ]; + nixpkgs.overlays = [overlays]; nixpkgs.config.allowUnfree = true; home-manager = { useGlobalPkgs = true; backupFileExtension = "backup"; - users.winston.imports = [ - ./home.nix - { - home.packages = [ - catppuccin-toolbox.packages.${system}.catwalk - ]; - } + sharedModules = [ + sops.homeManagerModules.sops + # TODO: remove hyprland from darwin, I just need this to work right now + hyprland.homeManagerModules.default ]; + users.winston.imports = [./home.nix]; extraSpecialArgs = { - sops = sops.homeManagerModules.sops; flakePath = "/Users/winston/.config/nixpkgs"; machine.personal = true; - - # TODO: remove hyprland from darwin, I just need this to work right now - hyprland = hyprland.homeManagerModules.default; }; }; }; diff --git a/home.nix b/home.nix index 8919447..edde9be 100644 --- a/home.nix +++ b/home.nix @@ -2,17 +2,13 @@ config, lib, pkgs, - sops, machine, - hyprland, ... }: let inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; in { imports = [ - hyprland - sops ./modules/firefox.nix ./modules/git.nix ./modules/gpg.nix @@ -31,8 +27,6 @@ in { ] ++ lib.optionals (builtins.pathExists ./modules/secrets.nix) [./modules/secrets.nix]; - manual.manpages.enable = false; - home = { packages = with pkgs; ([ zsh @@ -70,15 +64,21 @@ in { sessionVariables = { CARGO_HOME = "${config.xdg.dataHome}/cargo"; + CUDA_CACHE_PATH = "${config.xdg.dataHome}/nv"; + DOCKER_CONFIG = "${config.xdg.configHome}/docker"; NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; - RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; PATH = "$PATH:${config.xdg.dataHome}/krew/bin:$GOPATH/bin"; + RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; + # XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; + XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompose"; } - // lib.mkIf isDarwin { - # https://github.com/NixOS/nix/issues/2033 - NIX_PATH = "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels\${NIX_PATH:+:$NIX_PATH}"; - SSH_AUTH_SOCK = "${config.xdg.configHome}/gnupg/S.gpg-agent.ssh"; - }; + // ( + if isDarwin + then { + SSH_AUTH_SOCK = "${config.xdg.configHome}/gnupg/S.gpg-agent.ssh"; + } + else {} + ); stateVersion = "22.11"; }; diff --git a/modules/i3.nix b/modules/i3.nix index 7b17d77..24938ca 100644 --- a/modules/i3.nix +++ b/modules/i3.nix @@ -141,6 +141,9 @@ in { xsession = lib.mkIf isLinux { enable = true; + initExtra = '' + export USERXSESSION="$XDG_CACHE_HOME/X11/xsession" + ''; windowManager.i3 = { enable = true; config = { diff --git a/modules/rice.nix b/modules/rice.nix index 7aefcbf..e3f0b1e 100644 --- a/modules/rice.nix +++ b/modules/rice.nix @@ -1,4 +1,5 @@ { + config, lib, pkgs, ... @@ -27,6 +28,7 @@ in { }; }; + gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; gtk2.extraConfig = '' gtk-xft-antialias=1 gtk-xft-hinting=1