cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: cyplo:874febac3d2099f0bb4c3d403e433b80efb5ee73
Branches Tags
cyplo:main
..
compare: cyplo:26cb86cae29b9c70b61ade7f2ba324f41ce94fa5
Branches Tags
cyplo:main

No commits in common. "874febac3d2099f0bb4c3d403e433b80efb5ee73" and "26cb86cae29b9c70b61ade7f2ba324f41ce94fa5" have entirely different histories.
874febac3d ... 26cb86cae2

5 changed files with 257 additions and 212 deletions
Show stats Expand all files Collapse all files

19
flake.lock
View file

@ -421,7 +421,8 @@
"nixpkgs-rust-analyzer": "nixpkgs-rust-analyzer", "nixpkgs-rust-analyzer": "nixpkgs-rust-analyzer",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nur": "nur", "nur": "nur",
"sops": "sops" "sops": "sops",
"veracrypt": "veracrypt"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -544,6 +545,22 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"veracrypt": {
"locked": {
"lastModified": 1696681798,
"narHash": "sha256-tvga08j8IOHrRbEnqJDc6bzO4la5i7ywf23kLs8W0OY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2bbbf414fed6ab89cd971f5645da692dad6d9420",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "2bbbf414fed6ab89cd971f5645da692dad6d9420",
"repo": "nixpkgs",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

94
flake.nix
View file

@ -1,10 +1,27 @@
{ {
description = "NixOS configuration with flakes"; description = "NixOS configuration with flakes";
outputs = { alejandra, cryptpad, darwin, disko, endless-sky, flake-compat outputs = {
, flake-utils, helix, home-manager, nil, nix-ld, nixos-hardware alejandra,
, nixpkgs-master, nixpkgs-nixos-unstable, nixpkgs-rust-analyzer cryptpad,
, nixpkgs-stable, nur, self, sops, }@inputs: darwin,
let disko,
endless-sky,
flake-compat,
flake-utils,
helix,
home-manager,
nil,
nix-ld,
nixos-hardware,
nixpkgs-master,
nixpkgs-nixos-unstable,
nixpkgs-rust-analyzer,
nixpkgs-stable,
nur,
self,
sops,
veracrypt,
} @ inputs: let
mkServer = pkgs: system: hostname: mkServer = pkgs: system: hostname:
pkgs.lib.nixosSystem { pkgs.lib.nixosSystem {
inherit system; inherit system;
@ -13,19 +30,21 @@
(import ./nixos/server-common.nix) (import ./nixos/server-common.nix)
sops.nixosModules.sops sops.nixosModules.sops
disko.nixosModules.disko disko.nixosModules.disko
({ pkgs, ... }: { ({pkgs, ...}: {
nixpkgs.overlays = [ inputs.cryptpad.overlays.default ]; nixpkgs.overlays = [inputs.cryptpad.overlays.default];
}) })
inputs.cryptpad.nixosModules.cryptpad inputs.cryptpad.nixosModules.cryptpad
]; ];
specialArgs = { inherit inputs system; }; specialArgs = {inherit inputs system;};
}; };
mkRaspi = pkgs: hostname: mkRaspi = pkgs: hostname:
pkgs.lib.nixosSystem { pkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = modules = [
[ (./. + "/nixos/boxes/${hostname}") sops.nixosModules.sops ]; (./. + "/nixos/boxes/${hostname}")
specialArgs = { inherit inputs; }; sops.nixosModules.sops
];
specialArgs = {inherit inputs;};
}; };
mkKiosk = pkgs: system: hostname: mkKiosk = pkgs: system: hostname:
pkgs.lib.nixosSystem { pkgs.lib.nixosSystem {
@ -40,8 +59,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.cyryl = { home-manager.users.cyryl = {
imports = imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
_module.args.inputs = inputs; _module.args.inputs = inputs;
_module.args.system = system; _module.args.system = system;
}; };
@ -51,11 +69,11 @@
inherit inputs system; inherit inputs system;
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable { nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {allowUnfree = true;};
}; };
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable { nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {allowUnfree = true;};
}; };
}; };
}; };
@ -69,14 +87,13 @@
sops.nixosModules.sops sops.nixosModules.sops
disko.nixosModules.disko disko.nixosModules.disko
nix-ld.nixosModules.nix-ld nix-ld.nixosModules.nix-ld
{ programs.nix-ld.dev.enable = true; } {programs.nix-ld.dev.enable = true;}
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.cyryl = { home-manager.users.cyryl = {
imports = imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
_module.args.inputs = inputs; _module.args.inputs = inputs;
_module.args.system = system; _module.args.system = system;
}; };
@ -86,19 +103,25 @@
inherit inputs system; inherit inputs system;
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable { nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {allowUnfree = true;};
};
nixpkgs-nixos-unstable = import nixpkgs-nixos-unstable {
inherit system;
}; };
nixpkgs-nixos-unstable =
import nixpkgs-nixos-unstable { inherit system; };
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable { nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {allowUnfree = true;};
};
nixpkgs-veracrypt = import veracrypt {
inherit system;
config = {allowUnfree = true;};
}; };
}; };
}; };
mkShell = packageSet: system: mkShell = packageSet: system: let
let pkgs = packageSet.legacyPackages.${system}; pkgs = packageSet.legacyPackages.${system};
in pkgs.mkShell { in
pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
inputs.alejandra.defaultPackage.${system} inputs.alejandra.defaultPackage.${system}
cacert cacert
@ -126,7 +149,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.cyryl = { home-manager.users.cyryl = {
imports = [ ./nixos/home-manager ]; imports = [./nixos/home-manager];
_module.args.inputs = inputs; _module.args.inputs = inputs;
_module.args.system = system; _module.args.system = system;
}; };
@ -146,12 +169,12 @@
bootstrap = nixpkgs-stable.lib.nixosSystem rec { bootstrap = nixpkgs-stable.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ (./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops ]; modules = [(./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops];
specialArgs = { specialArgs = {
inherit inputs system; inherit inputs system;
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable { nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {allowUnfree = true;};
}; };
}; };
}; };
@ -164,8 +187,7 @@
(import (import
"${inputs.nixpkgs-stable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix") "${inputs.nixpkgs-stable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
{ {
environment.systemPackages = environment.systemPackages = with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
neovim neovim
htop htop
btop btop
@ -197,7 +219,7 @@
console.earlySetup = true; console.earlySetup = true;
} }
]; ];
specialArgs = { inherit inputs; }; specialArgs = {inherit inputs;};
}; };
}; };
}; };
@ -232,6 +254,12 @@
repo = "nixpkgs"; repo = "nixpkgs";
ref = "2100c4926200b1ebbee032ad22113597195932f2"; ref = "2100c4926200b1ebbee032ad22113597195932f2";
}; };
veracrypt = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "2bbbf414fed6ab89cd971f5645da692dad6d9420";
};
nixos-hardware = { nixos-hardware = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
@ -301,7 +329,9 @@
}; };
cryptpad = { cryptpad = {
url = "github:michaelshmitty/cryptpad-flake"; url = "github:michaelshmitty/cryptpad-flake";
inputs = { nixpkgs.follows = "nixpkgs-stable"; }; inputs = {
nixpkgs.follows = "nixpkgs-stable";
};
}; };
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";

7
nixos/boxes/cupsnet/gitea-runner.nix
View file

@ -3,13 +3,6 @@ let
unstable = inputs.nixpkgs-nixos-unstable; unstable = inputs.nixpkgs-nixos-unstable;
package = unstable.legacyPackages."${system}".gitea-actions-runner; package = unstable.legacyPackages."${system}".gitea-actions-runner;
in { in {
disabledModules =
[ "services/continuous-integration/gitea-actions-runner.nix" ];
imports = [
"${unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix"
];
sops.secrets."gitea-runner-token" = { sops.secrets."gitea-runner-token" = {
sopsFile = ./gitea-runner-token.sops; sopsFile = ./gitea-runner-token.sops;
format = "binary"; format = "binary";

1
nixos/boxes/foryog/default.nix
View file

@ -51,7 +51,6 @@
"vscode-extension-ms-vscode-cpptools" "vscode-extension-ms-vscode-cpptools"
"vscode-with-extensions" "vscode-with-extensions"
"vscode" "vscode"
"veracrypt"
]; ];
home-manager.users.cyryl = { ... }: { home-manager.users.cyryl = { ... }: {

24
nixos/common.nix
View file

@ -1,5 +1,12 @@
{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: {
let config,
pkgs,
lib,
inputs,
nixpkgs-nixos-unstable-and-unfree,
nixpkgs-veracrypt,
...
}: let
stateVersion = "23.11"; stateVersion = "23.11";
username = "cyryl"; username = "cyryl";
in { in {
@ -30,7 +37,7 @@ in {
tmux tmux
usbutils usbutils
wget wget
veracrypt nixpkgs-veracrypt.veracrypt
]; ];
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
@ -54,10 +61,9 @@ in {
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
networking.nameservers = networking.nameservers = ["9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9"];
[ "9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9" ];
networking.hosts = { "10.11.99.1" = [ "remarkable" ]; }; networking.hosts = {"10.11.99.1" = ["remarkable"];};
programs.light.enable = true; programs.light.enable = true;
programs.adb.enable = true; programs.adb.enable = true;
@ -80,13 +86,13 @@ in {
enable = true; enable = true;
autoPrune.enable = true; autoPrune.enable = true;
daemon.settings = { daemon.settings = {
"insecure-registries" = [ "vpsfree1.raptor-carp.ts.net:5000" ]; "insecure-registries" = ["vpsfree1.raptor-carp.ts.net:5000"];
}; };
}; };
fonts.fontconfig = { fonts.fontconfig = {
enable = true; enable = true;
defaultFonts.monospace = [ "BerkeleyMono Nerd Font" ]; defaultFonts.monospace = ["BerkeleyMono Nerd Font"];
}; };
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -112,7 +118,7 @@ in {
''; '';
}; };
system = { inherit stateVersion; }; system = {inherit stateVersion;};
system.activationScripts.diff = '' system.activationScripts.diff = ''
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
''; '';