jopejoe1/nix-conf
1
0
Fork 0
mirror of https://codeberg.org/jopejoe1/nix-conf.git synced 2025-01-01 16:06:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

run nixpkgs-fmt

Browse source
This commit is contained in:
Johannes Jöns 2024-01-19 13:42:27 +01:00
parent 830243253e
commit 8d7d732a1f
8 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1705534402, "lastModified": 1705660110,
"narHash": "sha256-mOWT45HLd8dm8FJNmrgngotE5NRJ+2arz65m1Kk0LBA=", "narHash": "sha256-q5cEuYpgWEsgcKhRzJ7i87N2hf1saMX42WBQc9LrKO4=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "6a928ce99e4ccb09e59c1f58052bd65027249c8a", "rev": "516de0615e77d6e4d1ea5c405c776c0b0d6c1e4c",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705535278, "lastModified": 1705660020,
"narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", "rev": "2064348e555b6aa963da6372a8f14e6acb80a176",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
home-modules/firefox/default.nix
View file

@ -245,7 +245,7 @@ in {
} }
]; ];
}]; }];
icon ="${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ]; definedAliases = [ "@np" ];
}; };
"NixOS Modules" = { "NixOS Modules" = {
@ -279,7 +279,7 @@ in {
} }
]; ];
}]; }];
icon ="${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@hm" ]; definedAliases = [ "@hm" ];
}; };
"Repology" = { "Repology" = {

2
modules/keyboard/default.nix
View file

@ -6,7 +6,7 @@ in {
enable = lib.mkEnableOption "Enable Keyboard"; enable = lib.mkEnableOption "Enable Keyboard";
layout = lib.mkOption { layout = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "us"; default = "us";
description = lib.mdDoc "Keyboard Layout."; description = lib.mdDoc "Keyboard Layout.";
}; };
}; };

2
modules/sway/default.nix
View file

@ -7,7 +7,7 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.sway = { programs.sway = {
enable = true; enable = true;
}; };
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

2
packages/default.nix
View file

@ -10,7 +10,7 @@
}; };
libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: { libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: {
patches = (old.patches or [ ])++ [ ./adwaita-theming-support.patch ]; patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ];
doCheck = false; doCheck = false;
}); });

10
systems/default.nix
View file

@ -2,7 +2,7 @@
let let
mkSystem = systemConfig: name: nixpkgs.lib.nixosSystem rec { mkSystem = systemConfig: name: nixpkgs.lib.nixosSystem rec {
system = builtins.replaceStrings ["-unknown-" "-gnu"] ["-" ""] systemConfig; system = builtins.replaceStrings [ "-unknown-" "-gnu" ] [ "-" "" ] systemConfig;
specialArgs = inputs; specialArgs = inputs;
modules = [ modules = [
./${name} ./${name}
@ -23,8 +23,8 @@ in
jurojin = mkSystem "aarch64-unknown-linux-gnu" "jurojin"; jurojin = mkSystem "aarch64-unknown-linux-gnu" "jurojin";
sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na"; sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na";
benzaiten = mkSystem "x86_64-unknown-linux-gnu" "benzaiten"; benzaiten = mkSystem "x86_64-unknown-linux-gnu" "benzaiten";
kamimusubi = mkSystem "x86_64-unknown-linux-gnu" "kamimusubi"; kamimusubi = mkSystem "x86_64-unknown-linux-gnu" "kamimusubi";
ebisu = mkSystem "x86_64-unknown-linux-gnu" "ebisu"; ebisu = mkSystem "x86_64-unknown-linux-gnu" "ebisu";
hetzner = mkSystem "x86_64-unknown-linux-gnu" "hetzner"; hetzner = mkSystem "x86_64-unknown-linux-gnu" "hetzner";
zap = mkSystem "x86_64-unknown-linux-gnu" "zap"; zap = mkSystem "x86_64-unknown-linux-gnu" "zap";
} }

2
systems/kuraokami/default.nix
View file

@ -104,5 +104,5 @@
}; };
nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ] nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ]
++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or []); ++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or [ ]);
} }

57
systems/zap/default.nix
View file

@ -12,7 +12,8 @@
}; };
imports = imports =
[ (modulesPath + "/profiles/qemu-guest.nix") [
(modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
@ -36,22 +37,22 @@
}; };
# networking = { # networking = {
# wireless.enable = lib.mkForce false; # wireless.enable = lib.mkForce false;
# interfaces.eth0 = { # interfaces.eth0 = {
# ipv4.addresses = [{ # ipv4.addresses = [{
# address = "134.255.219.135"; # address = "134.255.219.135";
# prefixLength = 24; # prefixLength = 24;
# }]; # }];
# }; # };
# interfaces.ens18 = { # interfaces.ens18 = {
# ipv4.addresses = [{ # ipv4.addresses = [{
# address = "185.249.199.92"; # address = "185.249.199.92";
# prefixLength = 24; # prefixLength = 24;
# }]; # }];
# }; # };
# defaultGateway = "134.255.219.1"; # defaultGateway = "134.255.219.1";
# }; # };
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -77,17 +78,17 @@
type = "table"; type = "table";
format = "msdos"; format = "msdos";
partitions = [ partitions = [
# { # {
# name = "ESP"; # name = "ESP";
# start = "1M"; # start = "1M";
# end = "500M"; # end = "500M";
# bootable = true; # bootable = true;
# content = { # content = {
# type = "filesystem"; # type = "filesystem";
# format = "vfat"; # format = "vfat";
# mountpoint = "/boot"; # mountpoint = "/boot";
# }; # };
# } # }
{ {
name = "root"; name = "root";
start = "500M"; start = "500M";