diff --git a/flake.lock b/flake.lock index a38a4cc..e0ef018 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1755519972, - "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", + "lastModified": 1756115622, + "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", "owner": "nix-community", "repo": "disko", - "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", + "rev": "bafad29f89e83b2d861b493aa23034ea16595560", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1755491080, - "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", + "lastModified": 1756496801, + "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", + "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", "type": "github" }, "original": { @@ -210,16 +210,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -242,11 +242,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756386758, + "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1755095763, - "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", + "lastModified": 1756305488, + "narHash": "sha256-+6cgFdac+DN5PAZg3YtRXAEdk++r6msy7wfFMNMNsEY=", "owner": "nix-community", "repo": "nixvim", - "rev": "ecc7880e00a2a735074243d8a664a931d73beace", + "rev": "b7e96214e8e7244eceae73c606dcd243f6d180a3", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1754301638, - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", + "lastModified": 1755555503, + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", "owner": "NuschtOS", "repo": "search", - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/yadunut@penguin/default.nix b/homes/x86_64-linux/yadunut@penguin/default.nix index 4f667bf..c472520 100644 --- a/homes/x86_64-linux/yadunut@penguin/default.nix +++ b/homes/x86_64-linux/yadunut@penguin/default.nix @@ -13,6 +13,13 @@ nushell.enable = true; neovim.enable = true; + home.packages = with pkgs; [ + ouch + dive + just + rsync + ]; + services = { ollama = { enable = true; @@ -26,10 +33,6 @@ "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ]; - programs = { - gh.enable = true; - }; - home.stateVersion = "25.11"; programs.home-manager.enable = true; } diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix index 715f9d4..3f21f2b 100644 --- a/modules/home/neovim/default.nix +++ b/modules/home/neovim/default.nix @@ -344,7 +344,7 @@ in }; project-nvim = { - enable = true; + enable = false; enableTelescope = true; }; web-devicons.enable = true; diff --git a/modules/home/nushell/default.nix b/modules/home/nushell/default.nix index 0c4bc92..25110c3 100644 --- a/modules/home/nushell/default.nix +++ b/modules/home/nushell/default.nix @@ -15,6 +15,7 @@ in }; config = mkIf cfg.enable { + home.shell.enableNushellIntegration = true; programs = { nushell = { enable = true; @@ -22,7 +23,15 @@ in $env.config.edit_mode = "vi" $env.config.buffer_editor = "nvim" $env.config.show_banner = false - ''; + ''; + shellAliases = { + lg = "lazygit"; + js = "jj status"; + jd = "jj diff"; + jn = "jj new"; + jf = "jj git fetch"; + jp = "jj git push"; + }; }; nix-your-shell = { enable = true; diff --git a/modules/nixos/my_users/default.nix b/modules/nixos/my_users/default.nix index 06126e2..65ac64f 100644 --- a/modules/nixos/my_users/default.nix +++ b/modules/nixos/my_users/default.nix @@ -29,7 +29,7 @@ in users.users = { yadunut = lib.snowfall.mkUser { extraGroups = [ "wheel" ]; - shell = pkgs.zsh; + shell = pkgs.nushell; hashedPassword = "$y$j9T$9ATrmrhedhb.mAZ4//PiN/$OStCOaJHt3kPA63imTG3zLMWCSLoWCUph5O6jl5mcZ."; }; root = lib.snowfall.mkUser { diff --git a/systems/x86_64-linux/penguin/default.nix b/systems/x86_64-linux/penguin/default.nix index ba6e13c..30f40f3 100644 --- a/systems/x86_64-linux/penguin/default.nix +++ b/systems/x86_64-linux/penguin/default.nix @@ -32,16 +32,18 @@ in time.timeZone = "Asia/Singapore"; - networking.firewall = { - enable = true; - allowedTCPPorts = [ - 22 - 3000 - 3001 - ]; - networkmanager.enable = true; - nftables.enable = true; - trustedInterfaces = [ "tailscale0" ]; + networking={ + networkmanager.enable = true; + nftables.enable = true; + firewall = { + enable = true; + allowedTCPPorts = [ + 22 + 3000 + 3001 + ]; + trustedInterfaces = [ "tailscale0" ]; + }; }; services.openssh = {