Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:0281e6cfeb6dd94f6e80215f1decc43c1326459a
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:6871f8f301fa1a72c01b83f0955b35987737b0aa
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "0281e6cfeb6dd94f6e80215f1decc43c1326459a" and "6871f8f301fa1a72c01b83f0955b35987737b0aa" have entirely different histories.
0281e6cfeb ... 6871f8f301

11 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -124,16 +124,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700814205, "lastModified": 1700392168,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a", "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -270,16 +270,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701263465, "lastModified": 1700989516,
"narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", "narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", "rev": "d2e4de209881b38392933fabf303cde3454b0b4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-23.05",
"type": "indirect" "type": "indirect"
} }
}, },

4
flake.nix
View file

@ -2,7 +2,7 @@
description = "Configuration for Everest"; description = "Configuration for Everest";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
agenix = { agenix = {
@ -14,7 +14,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

8
machines/Everest/configuration.nix
View file

@ -28,14 +28,10 @@
prefixLength = 24; prefixLength = 24;
} ]; } ];
}; };
# I use networkd, so I need to declare the interface for the default gateway defaultGateway = "192.168.0.1";
defaultGateway = {
address = "192.168.0.1";
interface = "eno1";
};
nameservers = [ "8.8.8.8" ]; nameservers = [ "8.8.8.8" ];
}; };
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.toast = { users.users.toast = {
isNormalUser = true; isNormalUser = true;

4
roles/common/configuration.nix
View file

@ -69,7 +69,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
verbose = true; verbose = true;
users.toast = { config, ... }: { users.toast = { config, ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.05";
xdg = { xdg = {
userDirs = { userDirs = {
enable = true; enable = true;
@ -100,7 +100,7 @@
*/ */
system = { system = {
stateVersion = "23.11"; stateVersion = "23.05";
# Nix on nixos 23.05 does not have dirtyRev # Nix on nixos 23.05 does not have dirtyRev
configurationRevision = flakeSelf.sourceInfo.rev or flakeSelf.sourceInfo.dirtyRev or "dirty"; configurationRevision = flakeSelf.sourceInfo.rev or flakeSelf.sourceInfo.dirtyRev or "dirty";
nixos.variant_id = lib.strings.toLower config.networking.hostName; nixos.variant_id = lib.strings.toLower config.networking.hostName;

24
roles/common/programs/bat.nix
View file

@ -1,5 +1,17 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
# Home manager on 23.05 doesn't understand the new format, so I'll use the old one until 23.11 becomes stable
newformat = {
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "master";
hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
};
file = "Catppuccin-mocha.tmTheme";
};
oldformat = builtins.readFile (newformat.src + "/${newformat.file}");
in
{ {
home-manager = { home-manager = {
users.toast.programs.bat = { users.toast.programs.bat = {
@ -8,15 +20,7 @@
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
}; };
themes = { themes = {
catppuccin-mocha = { catppuccin-mocha = oldformat;
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "master";
hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
};
file = "Catppuccin-mocha.tmTheme";
};
}; };
}; };
}; };

58
roles/common/services/syncthing.nix
View file

@ -5,39 +5,39 @@
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
openDefaultPorts = true; openDefaultPorts = true;
settings = { extraOptions = {
options = { options = {
urAccepted = 3; urAccepted = 3;
}; };
# Set up devices and folders common to every device };
devices = { # Set up devices and folders common to every device
"phone" = { devices = {
name = "Xiaomi Redmi Note 10 Pro"; "phone" = {
id = "K7KNZ5V-XREUADL-CROQXPV-6AA4H65-2VUD34Z-VQWKJ6S-LWWW4EE-XPNEZQ6"; name = "Xiaomi Redmi Note 10 Pro";
}; id = "K7KNZ5V-XREUADL-CROQXPV-6AA4H65-2VUD34Z-VQWKJ6S-LWWW4EE-XPNEZQ6";
"pc" = {
name = "Archie";
id = "NJPX754-64AQNP3-7GZFIRZ-W2EDRJQ-27ORWYM-X5YXEXQ-ERRTRTQ-BSYD4AY";
};
"steamdeck" = {
name = "Steam Deck";
id = "DNFEGEA-PDEVW5A-O5VBVQK-IUXI7J5-MAHCQAG-2JLEFFM-DSXB6AS-TX6ZHAN";
};
"server" = {
name = "Everest";
id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
};
"surface" = {
name = "Surface Go";
id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
};
}; };
folders = { "pc" = {
"passwords" = { name = "Archie";
label = "KeePassXC Passwords"; id = "NJPX754-64AQNP3-7GZFIRZ-W2EDRJQ-27ORWYM-X5YXEXQ-ERRTRTQ-BSYD4AY";
id = "rdyaq-ex659"; };
devices = [ "phone" "pc" "steamdeck" "server" "surface"]; "steamdeck" = {
}; name = "Steam Deck";
id = "DNFEGEA-PDEVW5A-O5VBVQK-IUXI7J5-MAHCQAG-2JLEFFM-DSXB6AS-TX6ZHAN";
};
"server" = {
name = "Everest";
id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
};
"surface" = {
name = "Surface Go";
id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
};
};
folders = {
"passwords" = {
label = "KeePassXC Passwords";
id = "rdyaq-ex659";
devices = [ "phone" "pc" "steamdeck" "server" "surface"];
}; };
}; };
}; };

2
roles/desktop/configuration.nix
View file

@ -9,7 +9,7 @@
users.users.toast.extraGroups = [ "scanner" ]; users.users.toast.extraGroups = [ "scanner" ];
# Set up fonts # Set up fonts
fonts.packages = [ fonts.fonts = [
( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } ) ( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } )
]; ];

2
roles/desktop/services/syncthing.nix
View file

@ -6,7 +6,7 @@
user = "toast"; user = "toast";
group = "users"; group = "users";
dataDir = config.users.users.toast.home; dataDir = config.users.users.toast.home;
settings.folders."passwords".path = "~/Documents/Passwords"; folders."passwords".path = "~/Documents/Passwords";
}; };
# Allow regular users to stop syncthing # Allow regular users to stop syncthing
# https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service # https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service

2
roles/gaming/services/syncthing.nix
View file

@ -6,7 +6,7 @@
TODO: turn this into a module eventually TODO: turn this into a module eventually
*/ */
services.syncthing.settings.folders = { services.syncthing.folders = {
"steam-201810" = { "steam-201810" = {
label = "Wolfenstein The New Order Saves"; label = "Wolfenstein The New Order Saves";
id = "laxxf-t2wmy"; id = "laxxf-t2wmy";

2
roles/school/services/syncthing.nix
View file

@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
{ {
services.syncthing.settings.folders = { services.syncthing.folders = {
"school-things" = { "school-things" = {
label = "School things"; label = "School things";
id = "z6alc-nfoqr"; id = "z6alc-nfoqr";

2
roles/server/syncthing.nix
View file

@ -11,7 +11,7 @@
key = config.age.secrets.syncthingKey.path; key = config.age.secrets.syncthingKey.path;
cert = config.age.secrets.syncthingCert.path; cert = config.age.secrets.syncthingCert.path;
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
settings.folders = { folders = {
"passwords" = { "passwords" = {
path = "${config.services.syncthing.dataDir}/passwords"; path = "${config.services.syncthing.dataDir}/passwords";
}; };