diff --git a/falcon-nixos/configuration.nix b/falcon-nixos/configuration.nix index 9835e0c..75a4d26 100644 --- a/falcon-nixos/configuration.nix +++ b/falcon-nixos/configuration.nix @@ -48,7 +48,7 @@ nixpkgs.config.allowUnfree = true; hardware.opengl = { - enable = true; + enable = true; }; hardware.nvidia = { diff --git a/falcon-nixos/flake.lock b/falcon-nixos/flake.lock deleted file mode 100644 index ecb8c7e..0000000 --- a/falcon-nixos/flake.lock +++ /dev/null @@ -1,145 +0,0 @@ -{ - "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", - "owner": "ryantm", - "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/falcon-nixos/flake.nix b/falcon-nixos/flake.nix deleted file mode 100644 index 12a2445..0000000 --- a/falcon-nixos/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - description = "A very basic flake"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - agenix.url = "github:ryantm/agenix"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { self, nixpkgs, home-manager, agenix, ... }@inputs: { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - - modules = [ - ./configuration.nix - agenix.nixosModules.default - { _module.args = { inherit inputs; };} - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.yadunut = import ./home.nix; - } - ]; - }; - }; -} diff --git a/falcon-nixos/home.nix b/falcon-nixos/home.nix index 365d430..4eae638 100644 --- a/falcon-nixos/home.nix +++ b/falcon-nixos/home.nix @@ -4,13 +4,13 @@ home.homeDirectory = "/home/yadunut"; home.packages = with pkgs; [ - ripgrep + ripgrep ]; imports = [ - (import ../modules/zsh.nix) - (import ../modules/git.nix) - (import ../modules/neovim.nix) + (import ../modules/zsh.nix) + (import ../modules/git.nix) + (import ../modules/neovim.nix) ]; programs.direnv = { diff --git a/flake.lock b/flake.lock index 3548c2c..65ec391 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { diff --git a/modules/zsh.nix b/modules/zsh.nix index 4bc3233..4bfc74d 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: { home.packages = with pkgs; [ - zsh-completions - bat - fd - htop - ripgrep - wget + zsh-completions + bat + fd + htop + ripgrep + wget ]; programs.zsh = { enable = true; @@ -16,15 +16,15 @@ editor.dotExpansion = true; pmodules = [ "environment" - "terminal" - "utility" - "directory" - "editor" - "history" - "syntax-highlighting" - "history-substring-search" - "autosuggestions" - "completion" + "terminal" + "utility" + "directory" + "editor" + "history" + "syntax-highlighting" + "history-substring-search" + "autosuggestions" + "completion" ]; }; shellAliases = { diff --git a/yadunut-mbp/home.nix b/yadunut-mbp/home.nix index d6afbdf..c1dc5e1 100644 --- a/yadunut-mbp/home.nix +++ b/yadunut-mbp/home.nix @@ -2,9 +2,9 @@ { imports = [ - (import ../modules/zsh.nix) - (import ../modules/git.nix) - (import ../modules/neovim.nix) + (import ../modules/zsh.nix) + (import ../modules/git.nix) + (import ../modules/neovim.nix) ]; # Home Manager needs a bit of information about you and the paths it should # manage. @@ -33,6 +33,8 @@ pkgs.typst-lsp pkgs.lazygit pkgs.jq + pkgs.nixfmt-rfc-style + pkgs.just # Neovim deps # pkgs.texlab