diff --git a/flake.lock b/flake.lock index 89d341b..79b7b19 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1705708511, - "narHash": "sha256-3f4BkRY70Fj7yvuo87c4QQPAjnt571g2wJ50jY7hnYc=", + "lastModified": 1706306660, + "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=", "owner": "nix-community", "repo": "home-manager", - "rev": "ce4b88c465d928f4f8b75d0920f1788d5b65ca94", + "rev": "b2f56952074cb46e93902ecaabfb04dd93733434", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1705697470, - "narHash": "sha256-Htn7xl9hjkDB+A8x0Y6/okwEUgCwKaKJFk4QNcXHN5k=", + "lastModified": 1706140641, + "narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", "owner": "neovim", "repo": "neovim", - "rev": "d3a8e9217f39c59dd7762bd22a76b8bd03ca85ff", + "rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1705709061, - "narHash": "sha256-Ai6ZAztEf310lxq93JWDzBKQfBlBZnGoHqAJYMV8W+M=", + "lastModified": 1706141075, + "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "664ff2a12e3f733dc1db467bd8b905438440f924", + "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705666311, - "narHash": "sha256-VYdSQm7zq3AStyHhRr3SBCTA8fVzrl6WtIlXTs2Wlts=", + "lastModified": 1706006310, + "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a455c5fb3ee513e2f443838a0e84d52b035adb67", + "rev": "b43bb235efeab5324c5e486882ef46749188eee2", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a4ecb3d..0436e82 100644 --- a/flake.nix +++ b/flake.nix @@ -34,17 +34,17 @@ nixpkgs, dwl-source, flood, + impermanence, ... - } @ rawInput: let + } @ inputs: let user = "zoriya"; - mkSystem = hostname: de: custom: let - inputs = rawInput // {inherit user;}; - in + mkSystem = hostname: de: custom: nixpkgs.lib.nixosSystem { specialArgs = inputs; modules = [ + impermanence.nixosModules.impermanence ./modules/misc (./modules + "/${de}") # nur.nixosModules.nur @@ -73,7 +73,6 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = inputs; users.${user} = { imports = [ ./modules/misc/home.nix @@ -88,14 +87,18 @@ in { nixosConfigurations = { fuhen = mkSystem "fuhen" "dwl" [ - ({lib, pkgs, ...}: { + ({ + lib, + pkgs, + ... + }: { hardware.tuxedo-rs = { enable = true; tailor-gui.enable = true; }; hardware.keyboard.zsa.enable = true; - environment.systemPackages = with pkgs; [ wally-cli ]; + environment.systemPackages = with pkgs; [wally-cli]; programs.gamescope.enable = true; }) diff --git a/modules/dwl/rofi/default.nix b/modules/dwl/rofi/default.nix index d8fd803..dd77f84 100644 --- a/modules/dwl/rofi/default.nix +++ b/modules/dwl/rofi/default.nix @@ -1,7 +1,5 @@ { pkgs, - config, - lib, ... }: { xdg.configFile."rofi/base16.rasi".text = with { diff --git a/modules/misc/home.nix b/modules/misc/home.nix index 6669720..b1c738f 100644 --- a/modules/misc/home.nix +++ b/modules/misc/home.nix @@ -36,9 +36,6 @@ xdg.configFile."nixpkgs/config.nix".text = '' { allowUnfree = true; - permittedInsecurePackages = [ - "nodejs-16.20.2" - ]; }''; home.stateVersion = "22.11"; diff --git a/modules/misc/impermanence.nix b/modules/misc/impermanence.nix index 944571f..d860097 100644 --- a/modules/misc/impermanence.nix +++ b/modules/misc/impermanence.nix @@ -1,5 +1,4 @@ -{impermanence, ...}: { - imports = [impermanence.nixosModules.impermanence]; +{ nix = { settings = { auto-optimise-store = true; diff --git a/modules/misc/nvim/lua/plugins/lsp.lua b/modules/misc/nvim/lua/plugins/lsp.lua index ca7e0cc..24cb0b8 100644 --- a/modules/misc/nvim/lua/plugins/lsp.lua +++ b/modules/misc/nvim/lua/plugins/lsp.lua @@ -92,6 +92,18 @@ return { tsserver = { root_dir = lspconfig.util.root_pattern("yarn.lock", "package-lock.json", ".git"), single_file_support = false, + commands = { + OrganizeImports = { + function() + vim.lsp.buf.execute_command({ + command = "_typescript.organizeImports", + arguments = { vim.api.nvim_buf_get_name(0) }, + title = "" + }) + end, + description = "Organize Imports" + }, + }, }, omnisharp = { handlers = { diff --git a/modules/misc/zsh/default.nix b/modules/misc/zsh/default.nix index 99714aa..ecf5271 100644 --- a/modules/misc/zsh/default.nix +++ b/modules/misc/zsh/default.nix @@ -45,12 +45,7 @@ in { # config.theme = "base16"; # }; - programs.less = { - enable = true; - # keys = '' - # \e quit - # ''; - }; + programs.less.enable = true; programs.zsh = { enable = true;