Julia/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix errors so system builds

Browse source
This commit is contained in:
Julia Lange 2024-04-09 00:00:42 -07:00
parent 73142b1bdf
commit a43df02076
9 changed files with 45 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

76
flake.lock generated
View file

@ -53,11 +53,11 @@
]
},
"locked": {
"lastModified": 1712339458,
"narHash": "sha256-j8pv3tL2EFLGuvFoO64dHWD8YzNvD77hRb4EEx5ADgE=",
"lastModified": 1712434681,
"narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "981b6617822dadc40246a6c70194d02dfc12e4c6",
"rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
"type": "github"
},
"original": {
@ -71,17 +71,19 @@
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1712457111,
"narHash": "sha256-hTRMWHl49SYfui2W3qCq790MHnX8JTBfYQcxgwjbQ0g=",
"lastModified": 1712635734,
"narHash": "sha256-x4vfyFFVh8X2Y84gKkhUqeM92u/2hpkD8lx9RAscqFw=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "f2a848cbcc41f29fb62ee67aef95136ae1a650da",
"rev": "d0d1ba5918206f16128e56988dd4db5d6d143338",
"type": "github"
},
"original": {
@ -142,27 +144,26 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"lastModified": 1712439257,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github"
},
"original": {
"owner": "NixOS",
"id": "nixpkgs",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "indirect"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1712310679,
"narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=",
"lastModified": 1712437997,
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "72da83d9515b43550436891f538ff41d68eecc7f",
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"type": "github"
},
"original": {
@ -187,57 +188,28 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1712420723,
"narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9e7f26f82acb057498335362905fde6fea4ca50a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"aagl": "aagl",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"sops-nix": "sops-nix"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1712458908,
"narHash": "sha256-DMgBS+jNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc=",
"lastModified": 1712617241,
"narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6",
"rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
"type": "github"
},
"original": {

11
flake.nix
View file

@ -2,15 +2,16 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs-stable.url = "nixpkgs/nixos-23.11";
hyprland.url = "github:hyprwm/Hyprland";
aagl = {
url = "github:ezKEa/aagl-gtk-on-nix";
inputs.nixpkgs.follows = "nixpkgs-stable";
};
hyprland.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
aagl.inputs.nixpkgs.follows = "nixpkgs-stable";
};
outputs = { self, nixpkgs, hyprland, aagl, sops-nix, ... }@inputs:
outputs = { self, nixpkgs, ... }@inputs:
let
defaultConfig = extraModules: nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };

3
nixosModules/apps/games/anime-launcher/default.nix
View file

@ -12,8 +12,9 @@
"Enables honkai 3rd impact";
};
config = lib.mkIf config.aagl.enable {
imports = [ inputs.aagl.nixosModules.default ];
config = lib.mkIf config.aagl.enable {
nix.settings = inputs.aagl.nixConfig;
programs.honkers-railway-launcher.enable =

6
nixosModules/services/graphics/wayland_compositors/default.nix
View file

@ -1,12 +1,16 @@
{ inputs, config, pkgs, lib, ... }:
{
options = {
hyprland.enable = lib.mkEnableOption "Enables hyprland";
};
imports = [
inputs.hyprland.nixosModules.default
];
config = lib.mkIf config.hyprland.enable {
imports = [ inputs.hyprland.nixosModules.default ];
programs.hyprland.enable = true;
nix.settings = {
substituters = [ "https://hyprland.cachix.org" ];

2
nixosModules/services/networking/wireless/default.nix
View file

@ -5,7 +5,7 @@
wireless.enable = lib.mkEnableOption "Enables wireless";
};
config = lib.mkIf confi.wireless.enable {
config = lib.mkIf config.wireless.enable {
networking.wireless = {
enable = true;
userControlled = {

2
nixosModules/services/pipewire/default.nix
View file

@ -13,9 +13,9 @@
alsa.enable = false;
alsa.support32Bit = false;
pulse.enable = true;
};
environment.systemPackages = with pkgs; [
pulsemixer
];
};
};
}

2
nixosModules/services/polkit/default.nix
View file

@ -10,5 +10,5 @@
environment.systemPackages = with pkgs; [
polkit-kde-agent
];
}
};
}

3
nixosModules/services/sops-nix/default.nix
View file

@ -5,9 +5,10 @@ let rootPath = ./.; in
sops-nix.enable = lib.mkEnableOption "Enables nix-sops for secret management";
};
config = lib.mkIf config.sops-nix.enable {
imports = [ inputs.sops-nix.nixosModules.sops ];
config = lib.mkIf config.sops-nix.enable {
sops = {
defaultSopsFile = rootPath + "secrets.yaml";
defaultSopsFormat = "yaml";

2
nixosModules/services/system/default.nix
View file

@ -4,7 +4,7 @@
options = {
user.name = lib.mkOption { default = "pan"; };
user.timezone = lib.mkOption { default = "America/Los_Angeles"; };
font.extraFonts = lib.mkOption { default = []; };
system.extraFonts = lib.mkOption { default = []; };
};
config = {