xqtc/nixos-config
1
0
Fork 0
mirror of https://git.gay/xqtc/nixos-config synced 2024-11-22 14:10:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of git.sr.ht:~xqtc/nixos-config

Browse source
This commit is contained in:
xqtc161 2024-03-06 17:20:01 +01:00
parent e093396119 0b85edb827
commit 4188d3f263
6 changed files with 111 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

194
flake.lock
View file

@ -1,60 +1,39 @@
{ {
"nodes": { "nodes": {
"agenix": { "devshell": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"systems": "systems"
},
"locked": {
"lastModified": 1707830867,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm",
"repo": "agenix",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"darwin": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"agenix", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1700795494, "lastModified": 1708939976,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
"owner": "lnl7", "owner": "numtide",
"repo": "nix-darwin", "repo": "devshell",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lnl7", "owner": "numtide",
"ref": "master", "repo": "devshell",
"repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1708661057, "lastModified": 1709352230,
"narHash": "sha256-2hKraBQB0n4znHHuT2f7TJ0DognzNFpnFPdKZjpnrSs=", "narHash": "sha256-7NfxOTEz15jHLxIRYS9WU4+PO0fypxJ/kkHC682Lhr0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "19101fae468c9773b99925eae619ebb24fc247da", "rev": "c13d9ef669a370fd70e6732e295513cd7342b20d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -132,14 +111,14 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1709126324,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,6 +128,24 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"
}, },
@ -191,36 +188,15 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"agenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1703113217, "lastModified": 1709204054,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1708591310,
"narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,7 +206,7 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_3": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -238,11 +214,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708558280, "lastModified": 1708988456,
"narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=", "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0b69d574162cfa6eb7919d5614a48d0185550891", "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708231718, "lastModified": 1709001452,
"narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", "rev": "6c06334f0843c7300d1678726bb607ce526f6b36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +250,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1708594753, "lastModified": 1709147990,
"narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,38 +265,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1708720103,
"narHash": "sha256-aSjM8KMdNHTnaIcptpO3EZoq63VT/b4jYPc9VxIzo34=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "899fe5550bd324dd8356c1ef652faf892cefb88e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1627814220, "lastModified": 1627814220,
"narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=",
@ -336,13 +280,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1708475490, "lastModified": 1709403298,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "narHash": "sha256-1Y2ywhgZ73PeeAQB3ndhfbDbAhBSFtxln30QjP8tr4c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260", "rev": "80b928afb1055901afdfd4ebb0ede839ab1686bb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,9 +314,10 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_3", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -364,11 +325,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1708614940, "lastModified": 1709387460,
"narHash": "sha256-36muWApzetaV4WAEeqKsWxW4k2l0u3E841RI4sHPiz0=", "narHash": "sha256-NTfi6gAsR5EReuvFGihuDUkBqb9DuQQqFviQcXVwX0c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "060a05138ca1a46fc0a0f79ef27f080cac57a59e", "rev": "274293fd691250ab96985aa4a04c653ab462876e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,7 +341,7 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -407,12 +368,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager_2", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixvim": "nixvim" "nixvim": "nixvim"
} }

4
flake.nix
View file

@ -8,7 +8,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
inputs.agenix.url = "github:ryantm/agenix"; #inputs.agenix.url = "github:ryantm/agenix";
inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
inputs.nixvim = { inputs.nixvim = {
@ -18,7 +18,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ {self, nixpkgs, nixpkgs-master, firefox-addons, home-manager, agenix, nixos-hardware, nixvim, ...}: let outputs = inputs @ {self, nixpkgs, nixpkgs-master, firefox-addons, home-manager, nixos-hardware, nixvim, ...}: let
lib = nixpkgs.lib; lib = nixpkgs.lib;
util = (import ./overlays/util.nix {} {}).util; util = (import ./overlays/util.nix {} {}).util;
system = "x86_64-linux"; system = "x86_64-linux";

1
home/config-files/waybar-mocha.css
View file

@ -78,6 +78,7 @@ window#waybar {
#clock, #clock,
#battery, #battery,
#battery.bat2,
#cpu, #cpu,
#memory, #memory,
#temperature, #temperature,

22
home/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
./modules/nixvim.nix ./modules/nixvim.nix
./modules/firefox.nix ./modules/firefox.nix
./modules/ssh.nix #./modules/ssh.nix
]; ];
home.username = "xqtc"; home.username = "xqtc";
home.homeDirectory = "/home/xqtc"; home.homeDirectory = "/home/xqtc";
@ -138,7 +138,7 @@ $character'';
height = 30; height = 30;
modules-left = [ "hyprland/workspaces" ]; modules-left = [ "hyprland/workspaces" ];
#modules-center = [ "hyprland/window" ]; #modules-center = [ "hyprland/window" ];
modules-right = [ "tray" "network" "battery" "clock" ]; modules-right = [ "tray" "network" "battery" "battery#bat2" "clock" ];
"tray" = { "tray" = {
"icon-size" = 21; "icon-size" = 21;
}; };
@ -149,13 +149,24 @@ $character'';
"max-length" = 50; "max-length" = 50;
}; };
"battery" = { "battery" = {
"bat" = "BAT1"; "bat" = "BAT0";
"interval" = 60; "interval" = 10;
"states" = { "states" = {
"warning" = 30; "warning" = 30;
"critical" = 15; "critical" = 15;
}; };
"format" = " BAT: {capacity}%"; "format" = " BAT IN: {capacity}%";
#"format-icons" = ''["", "", "", "", ""]'';
"max-length" = 25;
};
"battery#bat2" = {
"bat" = "BAT1";
"interval" = 10;
"states" = {
"warning" = 30;
"critical" = 15;
};
"format" = " BAT EX: {capacity}%";
#"format-icons" = ''["", "", "", "", ""]''; #"format-icons" = ''["", "", "", "", ""]'';
"max-length" = 25; "max-length" = 25;
}; };
@ -187,6 +198,7 @@ $character'';
moodle-dl moodle-dl
brightnessctl brightnessctl
pavucontrol
bitwarden bitwarden
bitwarden-cli bitwarden-cli

22
hosts/lilith/default.nix
View file

@ -107,16 +107,16 @@
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
jack.enable = true; jack.enable = true;
}; };
environment.etc = { #environment.etc = {
"wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
bluez_monitor.properties = { # bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true, # ["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true, # ["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true, # ["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" # ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
} # }
''; # '';
}; #};
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
@ -152,6 +152,8 @@
wdisplays wdisplays
#qemu_full #qemu_full
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
surrealdb
zathura
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

3
modules/home-manager.nix
View file

@ -8,6 +8,7 @@
home-manager.users.xqtc = {...}: {imports = [ home-manager.users.xqtc = {...}: {imports = [
../home ../home
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
inputs.agenix.homeManagerModules.default ]; }; #inputs.agenix.homeManagerModules.default
]; };
}; };
} }