diff --git a/flake.lock b/flake.lock index 65515f6..72bce9a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1730036420, - "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=", + "lastModified": 1731232837, + "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", "owner": "catppuccin", "repo": "nix", - "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b", + "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "hardware": { "locked": { - "lastModified": 1730068391, - "narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6906ac67a1078cf950b8527341e229eeecb5bc30", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -122,27 +122,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1731245184, + "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1731364708, + "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "4c91d52db103e757fc25b58998b0576ae702d659", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 053be1e..ee6e423 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs instance. - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # Snowfall lib imposes an opinionated file-structure, which makes things a little easier sometimes. snowfall-lib = { @@ -24,13 +24,19 @@ }; # Hardware specific tweaks and performance optimizations. - hardware.url = "github:NixOS/nixos-hardware/master"; + hardware = { + url = "github:NixOS/nixos-hardware/master"; + }; # Catppuccin theme nix configuration. - catppuccin.url = "github:catppuccin/nix"; + catppuccin = { + url = "github:catppuccin/nix"; + }; # Declarative management of Flatpak packages. - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; + nix-flatpak = { + url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; + }; }; outputs = inputs: diff --git a/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix b/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix new file mode 100644 index 0000000..df73f29 --- /dev/null +++ b/homes/x86_64-linux/jo@puzzlevision/apps/vscodium.nix @@ -0,0 +1,24 @@ +{ + lib, + pkgs, + inputs, + config, + ... +}: { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + wakatime.vscode-wakatime # Wakatime for coding statistics + vue.volar # Vue support + svelte.svelte-vscode # Svelte support + pkief.material-icon-theme # Material icons + prisma.prisma + ms-python.vscode-pylance # Python support + ms-dotnettools.csharp # CSharp support + mikestead.dotenv # Improved dotenv support + catppuccin.catppuccin-vsc # Catppuccin theme + jnoortheen.nix-ide # Nix language support + ]; + }; +} \ No newline at end of file diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index 9af58cb..22ba317 100644 --- a/homes/x86_64-linux/jo@puzzlevision/default.nix +++ b/homes/x86_64-linux/jo@puzzlevision/default.nix @@ -22,10 +22,10 @@ { imports = [ ./apps/gnome.nix + ./apps/vscodium.nix ]; themes.catppuccin.gtk.enable = true; - apps.zed-editor.enable = true; # Flatpak configuration. services.flatpak = { @@ -33,9 +33,7 @@ update.auto.enable = true; uninstallUnmanaged = true; - packages = [ - "com.jeffser.Alpaca" - ]; + packages = []; }; # Declare user packages. @@ -47,18 +45,18 @@ lunar-client steam g4music - blanket bitwarden-desktop - kitty ### Development avra avrdude jetbrains.phpstorm + jetbrains.pycharm-community git nodejs_22 bun devenv + python39 ### Rust development specific rustup diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix index 46ba150..a619683 100644 --- a/systems/x86_64-linux/puzzlevision/default.nix +++ b/systems/x86_64-linux/puzzlevision/default.nix @@ -79,6 +79,9 @@ ## Security pinentry-tty gnupg + + ## Development + arduino-ide ]; system.stateVersion = "23.05";