albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Updates

Browse source
This commit is contained in:
albert 2024-06-23 16:10:56 +09:00
parent 37bd5705f3
commit 294182bbcc
Signed by: albert
GPG key ID: 3895DD267CA11BA9
9 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
flake.lock
View file

@ -114,26 +114,6 @@
"type": "github" "type": "github"
} }
}, },
"compose2nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1717354014,
"narHash": "sha256-WwQo3TGnEbpp3tPqHHqqiXK3jXD9oykdhKaxrv9UzKs=",
"owner": "aksiksi",
"repo": "compose2nix",
"rev": "3cc5f141667c1dd434570ab6cb2dbac5739edc52",
"type": "github"
},
"original": {
"owner": "aksiksi",
"repo": "compose2nix",
"type": "github"
}
},
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1676,7 +1656,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"compose2nix": "compose2nix",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",

5
flake.nix
View file

@ -40,9 +40,6 @@
# Manage Plasma desktop with Nix # Manage Plasma desktop with Nix
plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.url = "github:pjones/plasma-manager";
plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
# compose2nix - Convert docker-compose.yml files to nix syntax
compose2nix.url = "github:aksiksi/compose2nix";
compose2nix.inputs.nixpkgs.follows = "nixpkgs";
# Hyprland Flake # Hyprland Flake
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
# Steam Deck configs for NixOS # Steam Deck configs for NixOS
@ -97,7 +94,7 @@
nixos-linode-img = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; }; nixos-linode-img = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; };
nixos-rpi4-img = libx.mkImage { hostname = "nixos-rpi4-img"; format = "sd-aarch64"; system = "aarch64-linux"; }; nixos-rpi4-img = libx.mkImage { hostname = "nixos-rpi4-img"; format = "sd-aarch64"; system = "aarch64-linux"; };
nixos-iso-console = libx.mkImage { hostname = "nixos-iso-console"; format = "iso"; }; nixos-iso-console = libx.mkImage { hostname = "nixos-iso-console"; format = "iso"; };
nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; unfree = true; }; nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "plasma6"; unfree = true; };
}; };
# Checks for deploy-rs - Makes deploy-rs fail when system evaluations fail # Checks for deploy-rs - Makes deploy-rs fail when system evaluations fail

1
nixos/common/services/docker.nix
View file

@ -15,7 +15,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker-compose docker-compose
ctop ctop
inputs.compose2nix.packages.${system}.default
]; ];
# Add the docker telegraf listener # Add the docker telegraf listener

1
nixos/common/services/podman.nix
View file

@ -23,7 +23,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
podman-compose podman-compose
podman-tui podman-tui
inputs.compose2nix.packages.${system}.default
]; ];
# Add the docker telegraf listener # Add the docker telegraf listener

2
nixos/default.nix
View file

@ -21,7 +21,7 @@
./common/modules/networking.nix # Initial Networking configs ./common/modules/networking.nix # Initial Networking configs
./common/modules/nixos.nix # NixOS related items ./common/modules/nixos.nix # NixOS related items
./common/modules/remote-builders.nix # Add remote builders ./common/modules/remote-builders.nix # Add remote builders
./common/modules/hosts.nix # Adblockers # ./common/modules/hosts.nix # Adblockers
./users/${username} ./users/${username}
./hosts/${hostname} ./hosts/${hostname}

1
nixos/hosts/milan-linode-01/containers/derp.nix
View file

@ -1,4 +1,3 @@
# Auto-generated using compose2nix v0.1.7.
{ ... }: { { ... }: {
services.cron = { services.cron = {
enable = true; enable = true;

7
nixos/hosts/nixos-desktop/default.nix
View file

@ -46,12 +46,7 @@
}; };
hardware = { hardware = {
opengl = { graphics.enable = true;
enable = true;
driSupport32Bit = true;
driSupport = true;
};
nvidia = { nvidia = {
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;

9
nixos/hosts/nixos-framework/default.nix
View file

@ -41,14 +41,7 @@
# Set the networking hostname: # Set the networking hostname:
networking.hostName = "nixos-framework"; networking.hostName = "nixos-framework";
hardware.graphics.enable = true;
hardware = {
opengl = {
enable = true;
driSupport32Bit = true;
driSupport = true;
};
};
programs.gamemode = { programs.gamemode = {
enable = true; enable = true;

1
nixos/hosts/osaka-linode-01/containers/derp.nix
View file

@ -1,4 +1,3 @@
# Auto-generated using compose2nix v0.1.7.
{ ... }: { { ... }: {
services.cron = { services.cron = {
enable = true; enable = true;