This commit is contained in:
2024-10-18 10:04:20 -05:00
parent 29a01705c3
commit a11206680a
8 changed files with 75 additions and 73 deletions

118
flake.lock generated
View File

@@ -38,11 +38,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-xrkH8ezy3xf6rsOTdqMSIoAaWnPHHIXxIuxszEJAh3M=",
"path": "/nix/store/n2w4j0gq96cncx9jjqqsyb43af1ivs5h-source/ags",
"path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/ags",
"type": "path"
},
"original": {
"path": "/nix/store/n2w4j0gq96cncx9jjqqsyb43af1ivs5h-source/ags",
"path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/ags",
"type": "path"
}
},
@@ -123,11 +123,11 @@
]
},
"locked": {
"lastModified": 1728326504,
"narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=",
"lastModified": 1728902391,
"narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0",
"rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
"type": "github"
},
"original": {
@@ -194,11 +194,11 @@
]
},
"locked": {
"lastModified": 1728638019,
"narHash": "sha256-eEga9ZYpWr4ippI8ntBdcNkXWY7qv1/9kK9jkemAyzQ=",
"lastModified": 1729099656,
"narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
"owner": "nix-community",
"repo": "disko",
"rev": "6af4e02b9cf2a4126af542c9e299f13228cfe2e0",
"rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
"type": "github"
},
"original": {
@@ -215,11 +215,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-SakyZnAhoToQmui5hozmLqkoLw6N/AHCgKF4tCP/sTQ=",
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/disko",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/disko",
"type": "path"
},
"original": {
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/disko",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/disko",
"type": "path"
}
},
@@ -644,11 +644,11 @@
]
},
"locked": {
"lastModified": 1727821604,
"narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=",
"lastModified": 1728669738,
"narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d",
"rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
"type": "github"
},
"original": {
@@ -770,11 +770,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-lXJ/q9VTQkjT7mXnTPXhiQ9FifWKlgonm9RvlVYO7lc=",
"path": "/nix/store/n2w4j0gq96cncx9jjqqsyb43af1ivs5h-source/hyprland",
"path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/hyprland",
"type": "path"
},
"original": {
"path": "/nix/store/n2w4j0gq96cncx9jjqqsyb43af1ivs5h-source/hyprland",
"path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/hyprland",
"type": "path"
}
},
@@ -792,11 +792,11 @@
"xdph": "xdph_2"
},
"locked": {
"lastModified": 1728645556,
"narHash": "sha256-Nio2vUxaya04xlvY24sPTOWz+mmDwgRgrBSU4Vx485Y=",
"lastModified": 1729195555,
"narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=",
"ref": "refs/heads/main",
"rev": "7564b26b7d386d248eaa47c1a481c09eefd8e3ca",
"revCount": 5328,
"rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f",
"revCount": 5352,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -932,11 +932,11 @@
]
},
"locked": {
"lastModified": 1727300645,
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"lastModified": 1728941256,
"narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"type": "github"
},
"original": {
@@ -1009,11 +1009,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1727649413,
"narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
"lastModified": 1729068498,
"narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
"rev": "e337457502571b23e449bf42153d7faa10c0a562",
"type": "github"
},
"original": {
@@ -1029,11 +1029,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-7ipphehm+qDglyyFxGz2ZYf9uNbXCohPCFAGSI2QMb8=",
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/impermanence",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/impermanence",
"type": "path"
},
"original": {
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/impermanence",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/impermanence",
"type": "path"
}
},
@@ -1058,12 +1058,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-IonQU9emwId8YSY5LwpXoNeK49y8RXZ3w54830/1ylE=",
"path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/home",
"narHash": "sha256-jR1BIfyY+rRVIZkzMOT5PK5PLvH5hoWwviq0GE6pY4w=",
"path": "/nix/store/86dqmj7f0b6w0qcik01h0pkj55kxxcxi-source/home",
"type": "path"
},
"original": {
"path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/home",
"path": "/nix/store/86dqmj7f0b6w0qcik01h0pkj55kxxcxi-source/home",
"type": "path"
}
},
@@ -1185,11 +1185,11 @@
},
"nixpkgs_10": {
"locked": {
"lastModified": 1728500571,
"narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
"lastModified": 1729044727,
"narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
"rev": "dc2e0028d274394f73653c7c90cc63edbb696be1",
"type": "github"
},
"original": {
@@ -1213,11 +1213,11 @@
},
"nixpkgs_12": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github"
},
"original": {
@@ -1434,11 +1434,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-B01IL6PFTcOaiaVsj3GnvmKb1Mc+PsajyoBSU7UE9zU=",
"path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/packages",
"path": "/nix/store/pq1ql9bpk85l01kmr4k074mh1q0rsqcf-source/packages",
"type": "path"
},
"original": {
"path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/packages",
"path": "/nix/store/pq1ql9bpk85l01kmr4k074mh1q0rsqcf-source/packages",
"type": "path"
}
},
@@ -1449,11 +1449,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=",
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/packages",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/packages",
"type": "path"
},
"original": {
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/packages",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/packages",
"type": "path"
}
},
@@ -1498,11 +1498,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"lastModified": 1728778939,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
"type": "github"
},
"original": {
@@ -1523,11 +1523,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-9L+1TDE6MNQVXd8Z869oLwjS3khchgAhhG+KCjPo4jc=",
"path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/programs",
"path": "/nix/store/pq1ql9bpk85l01kmr4k074mh1q0rsqcf-source/programs",
"type": "path"
},
"original": {
"path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/programs",
"path": "/nix/store/pq1ql9bpk85l01kmr4k074mh1q0rsqcf-source/programs",
"type": "path"
}
},
@@ -1538,12 +1538,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-ceYf8d9axHcJT/M6j8YEduxiSJBmVqUBH+qjiJyUW5M=",
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/programs",
"narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/programs",
"type": "path"
},
"original": {
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/programs",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/programs",
"type": "path"
}
},
@@ -1619,12 +1619,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-myuqvkh47bZIJWtMVxair+SI3VSpHO6ckt8EEbGtAPk=",
"path": "/nix/store/55wv92c5vx65n4id9gvkdzi5r5553i7g-source/sddm",
"narHash": "sha256-Lhot2oWRydfHcxrmZkLP3IczpZeRIVgJSzSawmUzeVQ=",
"path": "/nix/store/yiyl8nsc4jvylxs2zdj8vdmsipir01p5-source/sddm",
"type": "path"
},
"original": {
"path": "/nix/store/55wv92c5vx65n4id9gvkdzi5r5553i7g-source/sddm",
"path": "/nix/store/yiyl8nsc4jvylxs2zdj8vdmsipir01p5-source/sddm",
"type": "path"
}
},
@@ -1669,12 +1669,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-ptX91ThXvEMdpXbFlrAKqmk0X4YitvaNMKgpxfWU4/0=",
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/services",
"narHash": "sha256-Iek5h97Tc3MjuiLMbHC+K1bOk8QO5UCC5ZXG46erGzc=",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/services",
"type": "path"
},
"original": {
"path": "/nix/store/v0n6nmgs1g7ygcqsr161id8phhhh4xcd-source/services",
"path": "/nix/store/89k9izijgzj6cxvn6rmjmyf06a60s5wq-source/services",
"type": "path"
}
},
@@ -1688,12 +1688,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-XzsAbJgvL0qtbnVDmRizPn9j9SGeaz+QgUJMfLfRKvk=",
"path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/system",
"narHash": "sha256-018njfcELpo3GgfVxqyj0v/QNA5lBV7jdWlTQOzK8Ww=",
"path": "/nix/store/86dqmj7f0b6w0qcik01h0pkj55kxxcxi-source/system",
"type": "path"
},
"original": {
"path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/system",
"path": "/nix/store/86dqmj7f0b6w0qcik01h0pkj55kxxcxi-source/system",
"type": "path"
}
},
@@ -1785,11 +1785,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-4qcgTKJv2uerh2pzxBzFRaYh12KBI1ZlMhMtkl/MI90=",
"path": "/nix/store/xkqdsi3rl263jnjf9mj75k0ir3dimwqv-source/themes/tokyo-night",
"path": "/nix/store/bh2pz1fzkghjlj0bm0jhpa82cyv4zynv-source/themes/tokyo-night",
"type": "path"
},
"original": {
"path": "/nix/store/xkqdsi3rl263jnjf9mj75k0ir3dimwqv-source/themes/tokyo-night",
"path": "/nix/store/bh2pz1fzkghjlj0bm0jhpa82cyv4zynv-source/themes/tokyo-night",
"type": "path"
}
},

View File

@@ -1,9 +1,10 @@
{ lib, pkgs, core_inputs, ... }: {
{ config, lib, pkgs, core_inputs, ... }: {
imports = [
./generic
./laptop
./homebox
./hardware-configuration.nix
];
sysconfig.laptop.enable = lib.mkDefault false;
@@ -11,7 +12,6 @@
sysconfig.generic.enable = lib.mkDefault true;
networking = {
hostName = core_inputs.host;
nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
networkmanager.enable = true;
};

View File

@@ -1 +1,9 @@
{}
{ config, lib, ... }: {
options.sysconfig.generic.enable = {
type = lib.types.bool;
default = true;
};
config = lib.mkIf config.sysconfig.generic.enable {};
}

View File

@@ -21,8 +21,6 @@
sysconfig.generic.enable = lib.mkForce false;
imports = [];
boot = {
loader = {
systemd-boot.enable = true;

View File

@@ -21,8 +21,6 @@
sysconfig.generic.enable = lib.mkForce false;
imports = [];
boot = {
loader = {
systemd-boot.enable = true;

View File

@@ -19,7 +19,7 @@
nixosModule = { config, lib, pkgs, core_inputs, ... }: {
imports = [
./configuration/configuration.nix
./configuration
# inputs.diskoConfig.module
# inputs.impermanenceConfig.module
inputs.srvcs.module
@@ -64,11 +64,11 @@
}
];
networking.hostname = config.sysconfig.opts.host;
networking.hostName = lib.mkDefault config.sysconfig.opts.host;
users.users.${config.sysconfig.opts.username} = {
#users.users.${config.sysconfig.opts.username} = {
};
#};
};
};

View File

@@ -1,6 +1,6 @@
{ config, lib, ... }: {
options.sysconfig.opts.git.enable = lib.opions.mkOption {};
options.sysconfig.opts.git.enable = lib.options.mkOption {};
config = lib.mkIf config.sysconfig.opts.git.enable {

View File

@@ -18,8 +18,6 @@
config = lib.mkIf config.sysconfig.opts.sddm.enable {
imports = [];
qt.enable = true;
services.displayManager.sddm = {