This commit is contained in:
Martin Benonisen 2024-07-08 00:05:51 +02:00
parent b3c73d2113
commit 80b82185b6
Signed by: mbeno
SSH Key Fingerprint: SHA256:iAzOA1WUAxocdh/WRWXcSg5nw2dJ1aDCvPuT+3ZjkwI
6 changed files with 4 additions and 210 deletions

View File

@ -1,23 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -38,116 +20,7 @@
"type": "github" "type": "github"
} }
}, },
"nix-citizen": {
"inputs": {
"nix-gaming": "nix-gaming",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs",
"systems": "systems",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1715057822,
"narHash": "sha256-JRRNuUNjbLWu2/jyKE7c4WHK9JioMyDKpuAR2rUVDgI=",
"owner": "LovingMelody",
"repo": "nix-citizen",
"rev": "6b5b307006bcb2ca2375eb02ae698ffbbed76c20",
"type": "github"
},
"original": {
"owner": "LovingMelody",
"repo": "nix-citizen",
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nix-citizen",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720315345,
"narHash": "sha256-B7CRTjGf0Nll2RouHAzLsOt5L0u04JTN4vetrGXXmUk=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "96379e6b4d1f234ffd4bbe684d83a3d08a3dd2a7",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"nix-citizen",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703863825,
"narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1715008058,
"narHash": "sha256-Tdlna0uGWvQzGwc/7kL1ICx/fqJaBfFJAmrkKP+cZS4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "860e65d27036476edfb85dd847d982277880b143",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1719876945,
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713537308, "lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
@ -163,81 +36,10 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1710534455,
"narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-citizen": "nix-citizen", "nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1720321395,
"narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea",
"type": "github"
},
"original": {
"id": "sops-nix",
"type": "indirect"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nix-citizen",
"nixpkgs"
]
},
"locked": {
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
} }
} }
}, },

View File

@ -11,7 +11,6 @@
# ... # ...
nix-citizen.url = "github:LovingMelody/nix-citizen";
# Optional - updates underlying without waiting for nix-citizen to update # Optional - updates underlying without waiting for nix-citizen to update
@ -20,7 +19,7 @@
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, sops-nix , home-manager
, ... , ...
}@inputs: }@inputs:
let let
@ -35,7 +34,6 @@
modules = [ modules = [
({ config, pkgs, ... }: { }) ({ config, pkgs, ... }: { })
./hosts/zedd ./hosts/zedd
sops-nix.nixosModules.sops
]; ];
}; };
}; };

View File

@ -5,6 +5,7 @@
environment.pathsToLink = [ "/libexec" ]; environment.pathsToLink = [ "/libexec" ];
users.users.mbeno.extraGroups = [ "adbusers" ]; users.users.mbeno.extraGroups = [ "adbusers" ];
programs.adb.enable = true; programs.adb.enable = true;
system.autoUpgrade.enable = true;
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -59,10 +60,6 @@
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings = {
substituters = [ "https://nix-gaming.cachix.org" ];
trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ];
};
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.liveRestore = false; virtualisation.docker.liveRestore = false;
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?

View File

@ -57,7 +57,6 @@
nil nil
nixpkgs-fmt nixpkgs-fmt
curl curl
jellyfin-media-player
git git
libnotify libnotify
usbutils usbutils

View File

@ -6,8 +6,6 @@
extraSpecialArgs = { inherit pkgs inputs user; }; extraSpecialArgs = { inherit pkgs inputs user; };
users.${user} = { pkgs, ... }: { users.${user} = { pkgs, ... }: {
imports = [ imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./programs/neovim ./programs/neovim
./programs/firefox ./programs/firefox
./programs/tmux ./programs/tmux

View File

@ -1,9 +1,9 @@
{ pkgs, inputs, ... }: { { pkgs, inputs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Generic tools # Generic tools
inputs.nix-citizen.packages.${system}.star-citizen
age age
discord discord
jellyfin-media-player
pdfpc pdfpc
qpwgraph qpwgraph
mixxx mixxx