Henry-Hiles/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-arrange other files

Browse source
This commit is contained in:
Henry Hiles 2023-12-24 11:20:14 -05:00
parent a32dfc1089
commit d15f8e4a5f
12 changed files with 65 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
quadraticpc/background.jpg → background.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 362 KiB

36
flake.lock generated
View file

@ -203,11 +203,11 @@
]
},
"locked": {
"lastModified": 1703178811,
"narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=",
"lastModified": 1703368619,
"narHash": "sha256-ZGPMYL7FMA6enhuwby961bBANmoFX14EA86m2/Jw5Jo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae",
"rev": "a2523ea0343b056ba240abbac90ab5f116a7aa7b",
"type": "github"
},
"original": {
@ -243,11 +243,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1703207739,
"narHash": "sha256-KG8hgOj5OGm0kkS3PWEHCidv1IqgsT7+Cb48/IJhrrc=",
"lastModified": 1703380831,
"narHash": "sha256-JqptMO/EPgeeJOeyzF0whENAbKoN2DpMcr07fwwYy44=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "d8be07e1b418b71ff902fd05e2f7ad4e6cc4a10e",
"rev": "e12595103fee68cc57a9a16a6288c00f3d7ab828",
"type": "github"
},
"original": {
@ -258,11 +258,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1702539185,
"narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
"lastModified": 1703134684,
"narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
"rev": "d6863cbcbbb80e71cecfc03356db1cda38919523",
"type": "github"
},
"original": {
@ -307,11 +307,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"lastModified": 1703255338,
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github"
},
"original": {
@ -345,11 +345,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1703189725,
"narHash": "sha256-jyuUb2W8/BAocmSVRxzwZjAG0IBicpKdMxIzQVzfPAM=",
"lastModified": 1703423749,
"narHash": "sha256-riAEcZJCVbUhfC5aAL+gJ6nC/IE3P/W2w7MGLNFxsio=",
"owner": "wamserma",
"repo": "flake-programs-sqlite",
"rev": "20bdf3d48e601915ae594bd4038c2e21d5c4c39f",
"rev": "0b7ded98747dfb565baebe5aa0177e71264558ee",
"type": "github"
},
"original": {
@ -384,11 +384,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1703004037,
"narHash": "sha256-ceYPl/ML0kQBCUaOw0gG2TxHHEl4k9xivFpsdlKidIQ=",
"lastModified": 1703334881,
"narHash": "sha256-T7O1fbBXg4eq+4Bi+SDN9p4xgOHeZWOXQWTq0U8ximA=",
"owner": "danth",
"repo": "stylix",
"rev": "d14ac4912a9ab02f8b49b761e9e4b9ae836171af",
"rev": "96f0794dbd4b2ea499fe3c496a8e659bd4ffd68a",
"type": "github"
},
"original": {

27
flake.nix
View file

@ -25,11 +25,9 @@
home-manager,
...
} @ inputs: let
system = hostname: isDesktop: let
opt = nixpkgs.lib.optionals;
dirFiles = dir: map (file: "${dir}/${file}") (builtins.attrNames (builtins.readDir dir));
hostHasFile = file: (builtins.pathExists "${self}/${hostname}/${file}");
in
opt = nixpkgs.lib.optionals;
dirFiles = dir: map (file: "${dir}/${file}") (builtins.attrNames (builtins.readDir dir));
system = hostname: isDesktop:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
@ -43,15 +41,16 @@
inputs.nix-gaming.nixosModules.pipewireLowLatency
]
++ dirFiles ./modules/common
++ opt isDesktop dirFiles ./modules/common-desktop
++ opt (hostHasFile "home-manager.nix") [
home-manager.nixosModules.home-manager
"${self}/${hostname}/home-manager.nix"
]
++ opt (hostHasFile "stylix.nix") [
stylix.nixosModules.stylix
"${self}/${hostname}/stylix.nix"
];
++ opt isDesktop (
(dirFiles ./modules/common-desktop)
++ [
stylix.nixosModules.stylix
./stylix.nix
home-manager.nixosModules.home-manager
./home-manager.nix
]
);
};
in {
nixosConfigurations = {

27
home-manager.nix Executable file
View file

@ -0,0 +1,27 @@
{inputs, ...}: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
users.quadradical = {
home = {
username = "quadradical";
homeDirectory = "/home/quadradical";
};
};
sharedModules = [
{home.stateVersion = "23.11";}
./home-manager/gtk.nix
./home-manager/bat.nix
./home-manager/eza.nix
./home-manager/git.nix
./home-manager/btop.nix
./home-manager/vscode.nix
./home-manager/direnv.nix
./home-manager/firefox.nix
./home-manager/neofetch.nix
./home-manager/mangohud.nix
./home-manager/sway.nix
];
};
}

2
home-manager/vscode.nix
View file

@ -71,7 +71,7 @@
"editor.unicodeHighlight.nonBasicASCII" = false;
"dart.checkForSdkUpdates" = false;
"editor.codeActionsOnSave" = {
"source.fixAll" = true;
"source.fixAll" = "explicit";
};
"editor.bracketPairColorization.enabled" = true;
"explorer.fileNesting.enabled" = true;

6
modules/common-desktop/packages.nix
View file

@ -1,4 +1,8 @@
{pkgs, inputs, ...}: {
{
pkgs,
inputs,
...
}: {
environment.systemPackages = with pkgs; [
fd
tldr

2
modules/common-desktop/state-version.nix
View file

@ -1 +1 @@
{system.stateVersion = "23.05";}
{system.stateVersion = "23.11";}

28
quadraticpc/home-manager.nix
View file

@ -1,28 +0,0 @@
{inputs, ...}: {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users.quadradical = {
home = {
username = "quadradical";
homeDirectory = "/home/quadradical";
};
};
home-manager.sharedModules = [
{
programs.home-manager.enable = true;
home.stateVersion = "23.11";
}
../home-manager/gtk.nix
../home-manager/bat.nix
../home-manager/eza.nix
../home-manager/git.nix
../home-manager/btop.nix
../home-manager/vscode.nix
../home-manager/direnv.nix
../home-manager/firefox.nix
../home-manager/neofetch.nix
../home-manager/mangohud.nix
../home-manager/sway.nix
];
}

BIN
quadtop/background.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 362 KiB

27
quadtop/home-manager.nix
View file

@ -1,27 +0,0 @@
{inputs, ...}: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
users.quadradical = {
home = {
username = "quadradical";
homeDirectory = "/home/quadradical";
};
};
sharedModules = [
{home.stateVersion = "23.11";}
../home-manager/gtk.nix
../home-manager/bat.nix
../home-manager/eza.nix
../home-manager/git.nix
../home-manager/btop.nix
../home-manager/vscode.nix
../home-manager/direnv.nix
../home-manager/firefox.nix
../home-manager/neofetch.nix
../home-manager/mangohud.nix
../home-manager/sway.nix
];
};
}

41
quadtop/stylix.nix
View file

@ -1,41 +0,0 @@
{pkgs, ...}: {
stylix = {
polarity = "dark";
image = ./background.jpg;
base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
targets.plymouth.blackBackground = false;
cursor = {
name = "GoogleDot-Blue";
package = pkgs.google-cursor;
size = 24;
};
fonts = {
serif = {
name = "Cantarell";
package = pkgs.cantarell-fonts;
};
sansSerif = {
name = "Cantarell";
package = pkgs.cantarell-fonts;
};
monospace = {
name = "FiraCode Nerd Font";
package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
};
emoji = {
name = "Twitter Color Emoji";
package = pkgs.twitter-color-emoji;
};
sizes = {
applications = 11;
desktop = 11;
};
};
};
}

0
quadraticpc/stylix.nix → stylix.nix
View file