This commit is contained in:
Miguel Palhas
2024-09-29 17:53:45 +01:00
parent 327b575dc5
commit 5d0b7e26f5
6 changed files with 49 additions and 30 deletions
Executable
+3
View File
@@ -0,0 +1,3 @@
#!/bin/sh
nix build .#nixosConfigurations.live.config.system.build.isoImage
Generated
+23 -21
View File
@@ -49,6 +49,21 @@
"type": "github" "type": "github"
} }
}, },
"catppuccin": {
"locked": {
"lastModified": 1726952185,
"narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
"owner": "catppuccin",
"repo": "nix",
"rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -177,7 +192,9 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1727246346, "lastModified": 1727246346,
@@ -250,7 +267,7 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"systems": "systems", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
@@ -503,22 +520,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1726937504, "lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
@@ -534,7 +535,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1727348695, "lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -558,7 +559,7 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
@@ -600,10 +601,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixvim": "nixvim" "nixvim": "nixvim"
} }
}, },
+6 -1
View File
@@ -5,7 +5,10 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = { hyprland = {
type = "git"; type = "git";
url = "https://github.com/hyprwm/Hyprland.git"; url = "https://github.com/hyprwm/Hyprland.git";
@@ -14,6 +17,7 @@
}; };
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
catppuccin.url = "github:catppuccin/nix";
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: outputs = { self, nixpkgs, home-manager, ... }@inputs:
@@ -40,6 +44,7 @@
desktop = mkNixOS [ ./hosts/desktop ]; desktop = mkNixOS [ ./hosts/desktop ];
test = mkNixOS [ ./hosts/test ]; test = mkNixOS [ ./hosts/test ];
pi = mkNixOS [ ./hosts/pi ]; pi = mkNixOS [ ./hosts/pi ];
live = mkNixOS [ ./hosts/live ];
}; };
homeConfigurations = { homeConfigurations = {
@@ -1,12 +1,6 @@
{ inputs, ... }: { { inputs, ... }: {
programs = { programs = {
home-manager.enable = true;
git.enable = true;
fzf.enable = true;
neovim.enable = true;
ripgrep.enable = true;
gh.enable = true; gh.enable = true;
btop.enable = true;
lazygit.enable = true; lazygit.enable = true;
}; };
} }
+10 -2
View File
@@ -1,8 +1,16 @@
{ inputs, ... }: { { inputs, pkgs, ... }: {
imports = imports =
[ inputs.home-manager.nixosModules.home-manager ./nix.nix ./zsh.nix ]; [ inputs.home-manager.nixosModules.home-manager ./nix.nix ./zsh.nix ];
programs = { zsh.enable = true; }; environment.systemPackages = [
pkgs.btop
pkgs.fzf
pkgs.home-manager
pkgs.ripgrep
pkgs.zsh
pkgs.git
pkgs.neovim
];
time = { timeZone = "Europe/Lisbon"; }; time = { timeZone = "Europe/Lisbon"; };
+7
View File
@@ -0,0 +1,7 @@
{ inputs, pkgs, modulesPath, ... }: {
imports = [
(modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
../common/global
../common/docker.nix
];
}