Use Tauon

This commit is contained in:
Invariantspace 2023-10-25 17:37:16 -07:00
parent e3ceca74c0
commit 6ca65344a3
9 changed files with 63 additions and 134 deletions

View file

@ -5,12 +5,6 @@ let
usrPwdFile = "users/${usr}/password"; usrPwdFile = "users/${usr}/password";
in in
{ {
environment.systemPackages = with pkgs.fishPlugins; [
pisces
puffer
tide
];
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
users.${usr} = { users.${usr} = {
@ -64,6 +58,7 @@ in
}; };
}; };
ripgrep.enable = true; ripgrep.enable = true;
starship.enable = true;
tealdeer.enable = true; tealdeer.enable = true;
zoxide = { zoxide = {
enable = true; enable = true;

152
flake.lock generated
View file

@ -16,35 +16,16 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"darkmatter": { "darwin": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1683347392, "lastModified": 1697723594,
"narHash": "sha256-snW+8pJvBQ1B11FmUf6kSgARZW5OvW9uXgxA2VrlzcQ=", "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=",
"owner": "VandalByte",
"repo": "darkmatter-grub-theme",
"rev": "efe1abbde0aa9410217247d415ff734583af9711",
"type": "gitlab"
},
"original": {
"owner": "VandalByte",
"repo": "darkmatter-grub-theme",
"type": "gitlab"
}
},
"darwin": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1696360011,
"narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,14 +36,14 @@
}, },
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1697419184, "lastModified": 1698155728,
"narHash": "sha256-eRPjCyjdcqaME/baecZHyTQTn3k0AYFzN/S+u351FcE=", "narHash": "sha256-PUJ40o/0LyMEgSBEfLVyPA0K3gQnPYQDq9dW9nCOU9M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "325e1f7f2e0eea44c27e5e8a3946c2461ec095f2", "rev": "8c5d52db5690c72406b0cb13a5ac8554a287c93a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,22 +53,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1668681692,
@ -123,11 +88,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1697100850, "lastModified": 1698053470,
"narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,14 +103,14 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1697555443, "lastModified": 1698250431,
"narHash": "sha256-nsq8A+adEdN7bvVdz09LFyrHkTW5GtOzo/ctlHhyaaE=", "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b3acf1dc78b38a2fe03b287fead44d7ad25ac7c5", "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,8 +122,8 @@
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-22_11": "nixpkgs-22_11",
"nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-23_05": "nixpkgs-23_05",
"utils": "utils" "utils": "utils"
@ -180,7 +145,7 @@
"nix-custom": { "nix-custom": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"wallpaper-engine-kde-plugin-lib": "wallpaper-engine-kde-plugin-lib" "wallpaper-engine-kde-plugin-lib": "wallpaper-engine-kde-plugin-lib"
}, },
"locked": { "locked": {
@ -199,18 +164,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1661353537, "lastModified": 1687274257,
"narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"owner": "NixOS", "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"repo": "nixpkgs", "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", "type": "path"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixpkgs-unstable", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-22_11": { "nixpkgs-22_11": {
@ -245,11 +207,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1697332183, "lastModified": 1697929210,
"narHash": "sha256-ACYvYsgLETfEI2xM1jjp8ZLVNGGC0onoCGe+69VJGGE=", "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e1cff585c1a85aeab059d3109f66134a8f76935", "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,24 +223,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1687274257, "lastModified": 1697915759,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1697379843,
"narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,13 +237,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1697059129, "lastModified": 1697456312,
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,7 +253,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1670751203, "lastModified": 1670751203,
"narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=",
@ -319,7 +268,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1691654369, "lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
@ -335,13 +284,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1697456312, "lastModified": 1698134075,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,13 +300,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1697009197, "lastModified": 1697886341,
"narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "rev": "44881e03af1c730cbb1d72a4d41274a2c957813a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,28 +318,27 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"darkmatter": "darkmatter",
"darwin": "darwin", "darwin": "darwin",
"disko": "disko", "disko": "disko",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
"mailserver": "mailserver", "mailserver": "mailserver",
"nix-custom": "nix-custom", "nix-custom": "nix-custom",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1697339241, "lastModified": 1698273636,
"narHash": "sha256-ITsFtEtRbCBeEH9XrES1dxZBkE1fyNNUfIyQjQ2AYQs=", "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "51186b8012068c417dac7c31fb12861726577898", "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,7 +2,6 @@
description = "Entrypoint of all nix configurations"; description = "Entrypoint of all nix configurations";
inputs = { inputs = {
darkmatter.url = "gitlab:VandalByte/darkmatter-grub-theme";
darwin.url = "github:lnl7/nix-darwin"; darwin.url = "github:lnl7/nix-darwin";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";

View file

@ -9,13 +9,7 @@
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
device = "nodev"; device = "nodev";
efiSupport = true; theme = pkgs.sleek-grub-theme.override { withStyle = "dark"; };
efiInstallAsRemovable = true;
darkmatter-theme = {
enable = true;
style = "nixos";
resolution = "1440p";
};
}; };
# Set your time zone. # Set your time zone.

View file

@ -1,6 +1,5 @@
{ inputs, ... }: { { inputs, ... }: {
imports = with inputs; [ imports = with inputs; [
darkmatter.nixosModule
disko.nixosModules.disko disko.nixosModules.disko
hardware.nixosModules.asus-zephyrus-ga402 hardware.nixosModules.asus-zephyrus-ga402
] ++ [ ] ++ [

View file

@ -3,7 +3,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
exactaudiocopy exactaudiocopy
haruna haruna
jellyfin-media-player
lutris lutris
nvtop-amd nvtop-amd
mono mono
@ -11,6 +10,7 @@
qbittorrent qbittorrent
sweet sweet
sweet-nova sweet-nova
tauon
telegram-desktop telegram-desktop
thunderbird thunderbird
wineWowPackages.waylandFull wineWowPackages.waylandFull

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`). # and in the NixOS manual (accessible by running `nixos-help`).
{ ... }: { pkgs, ... }:
{ {
@ -10,12 +10,7 @@
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
device = "nodev"; device = "nodev";
efiSupport = true; theme = pkgs.sleek-grub-theme.override { withStyle = "dark"; };
efiInstallAsRemovable = true;
darkmatter-theme = {
enable = true;
style = "nixos";
};
}; };
# Set your time zone. # Set your time zone.

View file

@ -2,7 +2,6 @@
{ {
imports = with inputs; [ imports = with inputs; [
darkmatter.nixosModule
disko.nixosModules.disko disko.nixosModules.disko
hardware.nixosModules.common-cpu-amd hardware.nixosModules.common-cpu-amd
hardware.nixosModules.common-cpu-amd-pstate hardware.nixosModules.common-cpu-amd-pstate