aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock105
-rw-r--r--flake.nix26
-rw-r--r--home/alpha/boopy.nix (renamed from home/configurations/boopy@alpha.nix)0
-rw-r--r--home/configurations/default.nix5
-rw-r--r--home/default.nix22
-rw-r--r--home/modules/default.nix16
-rw-r--r--home/modules/misc/home/default.nix31
-rw-r--r--home/modules/profiles/base/config/waybar-settings-new.nix68
-rw-r--r--home/modules/profiles/base/config/waybar-settings.nix56
-rw-r--r--home/modules/profiles/multimedia/default.nix44
-rw-r--r--home/profiles/base/config/dunst.nix (renamed from home/modules/profiles/base/config/dunst.nix)0
-rw-r--r--home/profiles/base/config/foot.nix (renamed from home/modules/profiles/base/config/foot.nix)0
-rw-r--r--home/profiles/base/config/sway.nix (renamed from home/modules/profiles/base/config/sway.nix)0
-rw-r--r--home/profiles/base/config/waybar-settings.nix54
-rw-r--r--home/profiles/base/config/waybar-style.nix (renamed from home/modules/profiles/base/config/waybar-style.nix)2
-rw-r--r--home/profiles/base/default.nix (renamed from home/modules/profiles/base/default.nix)14
-rw-r--r--home/profiles/base/p10k-config/p10k.zsh (renamed from home/modules/profiles/base/p10k-config/p10k.zsh)0
-rw-r--r--home/profiles/browsing/default.nix (renamed from home/modules/profiles/browsing/default.nix)0
-rw-r--r--home/profiles/browsing/qutebrowser-settings.nix (renamed from home/modules/profiles/browsing/qutebrowser-settings.nix)6
-rw-r--r--home/profiles/default.nix (renamed from home/modules/profiles/default.nix)0
-rw-r--r--home/profiles/development/default.nix (renamed from home/modules/profiles/development/default.nix)10
-rw-r--r--home/profiles/messaging/default.nix (renamed from home/modules/profiles/messaging/default.nix)3
-rw-r--r--home/profiles/multimedia/default.nix49
-rw-r--r--home/profiles/research/default.nix (renamed from home/modules/profiles/research/default.nix)2
-rw-r--r--lib/mk_home.nix11
-rw-r--r--lib/mk_system.nix12
-rw-r--r--nixos/.sops.yaml9
-rw-r--r--nixos/alpha/configuration.nix (renamed from nixos/configurations/alpha.nix)7
-rw-r--r--nixos/alpha/hardware-configuration.nix (renamed from nixos/configurations/hardware/alpha.nix)0
-rw-r--r--nixos/alpha/secrets/secrets.yaml52
-rw-r--r--nixos/configurations/default.nix5
-rw-r--r--nixos/default.nix14
-rw-r--r--nixos/secrets/keys/hosts/alpha.asc28
-rw-r--r--nixos/secrets/keys/users/boopy.asc51
-rw-r--r--packages/default.nix6
-rw-r--r--packages/non-flake/default.nix5
36 files changed, 400 insertions, 313 deletions
diff --git a/flake.lock b/flake.lock
index 19b34f0..3422bdd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,28 @@
{
"nodes": {
+ "chaotic-nixpkgs": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1642336372,
+ "narHash": "sha256-1N+9qs4oFIp5tixvScZnVYKzDaaWfqDAPnbf0pWxKQE=",
+ "ref": "main",
+ "rev": "4f26096c0b3a717beaccf2fa96752a95f298d1f9",
+ "revCount": 11,
+ "type": "git",
+ "url": "https://git.sr.ht/~boppy/chaotic-nixpkgs"
+ },
+ "original": {
+ "ref": "main",
+ "type": "git",
+ "url": "https://git.sr.ht/~boppy/chaotic-nixpkgs"
+ }
+ },
"flake-compat": {
"flake": false,
"locked": {
@@ -18,11 +41,11 @@
},
"flake-utils": {
"locked": {
- "lastModified": 1629481132,
- "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+ "lastModified": 1638122382,
+ "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
+ "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
@@ -48,6 +71,21 @@
},
"flake-utils_3": {
"locked": {
+ "lastModified": 1629481132,
+ "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_4": {
+ "locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
@@ -68,27 +106,26 @@
]
},
"locked": {
- "lastModified": 1638150501,
- "narHash": "sha256-aWH3MRmjUtx8ciSGLegBJC5mhymsuroHPs74ZldrNTU=",
+ "lastModified": 1642463060,
+ "narHash": "sha256-6xXRxvMk4OV/k6VwJq54pahToT4FCZzOKfbvG7f6l1E=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9de77227d7780518cfeaee5a917970247f3ecc56",
+ "rev": "8cf13abffc0808b337590a9e382604ab6c2cb3e7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9de77227d7780518cfeaee5a917970247f3ecc56",
"type": "github"
}
},
"master": {
"locked": {
- "lastModified": 1642034024,
- "narHash": "sha256-H+XLDkfe3M/RvToKSVuOya0zx1d4vJhWiwfDtHc2sfQ=",
+ "lastModified": 1642462659,
+ "narHash": "sha256-vNFD3y54atPP5kgXwrnfUhCtHXqj4frmP0tmWS38eNo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "4a3032bbaa0629e0d6991f9f56ac63dad5ad64c4",
+ "rev": "13e3f202d27e96a1e0fc3ad288899bb46add775b",
"type": "github"
},
"original": {
@@ -100,18 +137,18 @@
},
"neovim": {
"inputs": {
- "flake-utils": "flake-utils",
+ "flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
- "lastModified": 1642010204,
- "narHash": "sha256-VfYBgGwBnzdjugb4InBWHLkNv58S6ECyKD6kBBUpN48=",
+ "lastModified": 1642453919,
+ "narHash": "sha256-wGf/RCpNv/PGEx6wHWgyCP0FkG5kaVvWvId7uiKcay4=",
"owner": "neovim",
"repo": "neovim",
- "rev": "39a35dd006e793c4ff4e09436c8fc268c4415bcf",
+ "rev": "fcf5dd34fdfde3a6632b96a88f66c1053cba08d1",
"type": "github"
},
"original": {
@@ -123,11 +160,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1642008389,
- "narHash": "sha256-nWYdmvmBOXYFktxe7ffwc8ESJQkIqTrzyCIZJk+Sir0=",
+ "lastModified": 1642373004,
+ "narHash": "sha256-AZ1fTklT9OkLFtmZ8qMbQ2Uf1dF0+np3WjnTIIquApA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "4f0b53702b8fdeea4c68fe34bdf9ce90817910fb",
+ "rev": "b13052a35a63e1ea9eba916ffe48886ab7af58ce",
"type": "github"
},
"original": {
@@ -137,29 +174,6 @@
"type": "github"
}
},
- "nixpkgs-extra": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-utils": "flake-utils_2",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1641015751,
- "narHash": "sha256-jzudZWz2T+6Y1v8IxzQ9Hb3D41926idQFW+ntqD0kOc=",
- "ref": "main",
- "rev": "92192e9c0b2c75c714498e595c147b3ade7459ee",
- "revCount": 6,
- "type": "git",
- "url": "https://git.sr.ht/~boppy/nixpkgs-extra"
- },
- "original": {
- "ref": "main",
- "type": "git",
- "url": "https://git.sr.ht/~boppy/nixpkgs-extra"
- }
- },
"phocus": {
"flake": false,
"locked": {
@@ -178,11 +192,12 @@
},
"root": {
"inputs": {
+ "chaotic-nixpkgs": "chaotic-nixpkgs",
+ "flake-utils": "flake-utils_2",
"home-manager": "home-manager",
"master": "master",
"neovim": "neovim",
"nixpkgs": "nixpkgs",
- "nixpkgs-extra": "nixpkgs-extra",
"phocus": "phocus",
"rust-overlay": "rust-overlay",
"sops-nix": "sops-nix",
@@ -191,17 +206,17 @@
},
"rust-overlay": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1641868896,
- "narHash": "sha256-R2hG3EqLSASjdzJlhn1leRmBwmatrzIyKXRaBfwbAPg=",
+ "lastModified": 1642387353,
+ "narHash": "sha256-CmpIo2whHN1ESXuKl9lL9CRJVK8YuEfV2JURFqmWNmw=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "84c58400556c1c5fa796cbc3215ba5bbd3bd848f",
+ "rev": "c76db6730b6bc150c49c9dcefc2323785516d1dc",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index eecd9ee..ebcd2ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,12 @@
master.url = "github:nixos/nixpkgs/master";
# https://github.com/nix-community/home-manager/issues/2546
- home-manager.url = "github:nix-community/home-manager?rev=9de77227d7780518cfeaee5a917970247f3ecc56";
+ home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
+ flake-utils.url = "github:numtide/flake-utils";
+ flake-utils.inputs.nixpkgs.follows = "nixpkgs";
+
sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
@@ -20,29 +23,26 @@
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
# https://github.com/NixOS/nix/pull/5342
- nixpkgs-extra.url = "git+https://git.sr.ht/~boppy/nixpkgs-extra?ref=main";
- nixpkgs-extra.inputs.nixpkgs.follows = "nixpkgs";
+ chaotic-nixpkgs.url = "git+https://git.sr.ht/~boppy/chaotic-nixpkgs?ref=main";
+ chaotic-nixpkgs.inputs.nixpkgs.follows = "nixpkgs";
phocus = { url = "git+https://git.sr.ht/~boppy/phocus"; flake = false; };
wallpapers = { url = "git+https://git.sr.ht/~boppy/wall?ref=main"; flake = false; };
};
- outputs = { self, nixpkgs, ... } @ inputs:
- {
- nixosModules = import ./nixos/modules;
- nixosConfigurations = import ./nixos/configurations inputs;
+ outputs = { self, nixpkgs, flake-utils, sops-nix, ... } @ inputs:
+ {
+
+ nixosConfigurations = import ./nixos inputs;
- homeModules = import ./home/modules;
- homeConfigurations = import ./home/configurations inputs;
+ homeConfigurations = import ./home inputs;
packages.x86_64-linux = (import ./packages inputs)
- // self.lib.nixosConfigurationsAsPackages.x86_64-linux
- // self.lib.homeConfigurationsAsPackages.x86_64-linux;
+ // self.lib.nixosConfigurationsAsPackages.x86_64-linux
+ // self.lib.homeConfigurationsAsPackages.x86_64-linux;
checks = self.packages;
lib = import ./lib inputs;
-
- non-flake = (import ./packages/non-flake inputs);
};
}
diff --git a/home/configurations/boopy@alpha.nix b/home/alpha/boopy.nix
index 237eb11..237eb11 100644
--- a/home/configurations/boopy@alpha.nix
+++ b/home/alpha/boopy.nix
diff --git a/home/configurations/default.nix b/home/configurations/default.nix
deleted file mode 100644
index ac44363..0000000
--- a/home/configurations/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ self, ... } @ inputs:
-
-{
- "boopy@alpha" = self.lib.mkHome "boopy" "alpha" "x86_64-linux" inputs.nixpkgs "22.05";
-}
diff --git a/home/default.nix b/home/default.nix
new file mode 100644
index 0000000..62e6aea
--- /dev/null
+++ b/home/default.nix
@@ -0,0 +1,22 @@
+{ self, nixpkgs, ... } @ inputs:
+
+{
+ "boopy@alpha" = self.lib.mkHome {
+ username = "boopy";
+ hostname = "alpha";
+ system = "x86_64-linux";
+ pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ inputs.rust-overlay.overlay ]; };
+
+ extraModules = [
+ ./profiles
+ ./profiles/base
+ ./profiles/browsing
+ ./profiles/development
+ ./profiles/messaging
+ ./profiles/multimedia
+ ./profiles/research
+ ];
+
+ version = "22.05";
+ };
+}
diff --git a/home/modules/default.nix b/home/modules/default.nix
deleted file mode 100644
index b096729..0000000
--- a/home/modules/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "profiles" = import ./profiles;
- "profiles/base" = import ./profiles/base;
- "profiles/browsing" = import ./profiles/browsing;
- "profiles/development" = import ./profiles/development;
- "profiles/messaging" = import ./profiles/messaging;
- "profiles/multimedia" = import ./profiles/multimedia;
- "profiles/research" = import ./profiles/research;
-
- "programs/nixpkgs" = import ./programs/nixpkgs;
- "programs/zshell" = import ./programs/zshell;
- "programs/spotify-tui" = import ./programs/spotify-tui;
-
- "misc/home" = import ./misc/home;
- "misc/neotheme" = import ./misc/neotheme;
-}
diff --git a/home/modules/misc/home/default.nix b/home/modules/misc/home/default.nix
deleted file mode 100644
index 80232e7..0000000
--- a/home/modules/misc/home/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, pkgs, lib, nixpkgs, self, ... }:
-
-{
- profiles.base.enable = true;
- fonts.fontconfig.enable = true;
-
-
- home = {
- stateVersion = "22.05";
- };
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/home/modules/profiles/base/config/waybar-settings-new.nix b/home/modules/profiles/base/config/waybar-settings-new.nix
deleted file mode 100644
index 4b55a05..0000000
--- a/home/modules/profiles/base/config/waybar-settings-new.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- # DISCLAIMER! On 22.05, do NOT use this until https://github.com/nix-community/home-manager/issues/2546 is solved.
- layer = "bottom";
- position = "top";
- height = 17;
- modules-left = [ "sway/workspaces" "sway/language" "cpu" "memory" ];
- modules-center = [ "clock" ];
- modules-right = [ "custom/weather" "pulseaudio" "network" ];
-
- "sway/workspaces" = {
- all-outputs = true;
-
- persistent_workspaces = {
- "α" = [ ];
- "β" = [ ];
- "γ" = [ ];
- "δ" = [ ];
- "ε" = [ ];
- "ζ" = [ ];
- "η" = [ ];
- "θ" = [ ];
- "ι" = [ ];
- "κ" = [ ];
- };
- };
-
- "sway/language" = {
- format = " {long}";
- };
-
- "clock" = {
- interval = 10;
- format = "{: %m/%d/%Y %I:%M %p}";
- };
-
- "cpu" = {
- interval = 5;
- format = " {load}%  {usage}%";
- };
-
- "custom/weather" = {
- format = " {}";
- exec = "curl 'wttr.in/?format='%t+-+%x+%C++%w'&M'";
- interval = 3600;
- };
-
- "network" = {
- interface = "enp4s0";
- format = " {ifname}";
- format-wifi = " {essid}";
- format-ethernet = " {ifname} {ipaddr}";
- format-disconnected = " Disconnected";
- max-length = 50;
- };
-
- "pulseaudio" = {
- format = "{icon} {volume}%";
- format-muted = "婢 Muted";
- format-source = "";
- format-source-muted = "Muted";
- format-icons.default = [ " " " " " " ];
- };
-
- "memory" = {
- interval = 5;
- format = " {used:0.1f}G / {total:0.1f}G ({percentage}%)";
- };
-}
diff --git a/home/modules/profiles/base/config/waybar-settings.nix b/home/modules/profiles/base/config/waybar-settings.nix
deleted file mode 100644
index fb691c0..0000000
--- a/home/modules/profiles/base/config/waybar-settings.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ neotheme }:
-
-with neotheme.colors;
-{
- layer = "bottom";
- position = "top";
- height = 21;
- modules-left = [ "pulseaudio" "custom/seperator" "cpu" "custom/seperator" "memory" ];
- modules-center = [ "sway/workspaces" ];
- modules-right = [ "clock" ];
-
- modules = {
- "sway/workspaces" = {
- all-outputs = true;
- persistent_workspaces = {
- "α" = [ ];
- "β" = [ ];
- "γ" = [ ];
- "δ" = [ ];
- "ε" = [ ];
- "ζ" = [ ];
- "η" = [ ];
- "θ" = [ ];
- "ι" = [ ];
- "κ" = [ ];
- };
- };
-
- "clock" = {
- interval = 10;
- format = "<span foreground='#${color5}'></span> {:%A, %b %d %H:%M}";
- };
-
- "cpu" = {
- interval = 5;
- format = "<span foreground='#${color2}'></span> {usage:3}%";
- };
-
- "pulseaudio" = {
- format = "<span foreground='#${color4}'>{icon}</span> {volume}%";
- format-muted = "ﱝ Muted";
- format-icons.default = [ " " " " " " ];
- };
-
- "memory" = {
- interval = 5;
- format = "<span foreground='#${color3}'>﬙</span> {used:0.2f}GiB";
- };
-
- "custom/seperator" = {
- format = "|";
- interval = "once";
- tooltip = false;
- };
- };
-}
diff --git a/home/modules/profiles/multimedia/default.nix b/home/modules/profiles/multimedia/default.nix
deleted file mode 100644
index 47cc1a9..0000000
--- a/home/modules/profiles/multimedia/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, lib, pkgs, ... }:
-let cfg = config.profiles.multimedia;
-in
-{
- options.profiles.multimedia = {
- enable = lib.mkEnableOption
- "A profile that enables the system to be used for consuming multimedia contents.";
- };
-
- config = lib.mkIf cfg.enable {
- home.packages = with pkgs; [ spotify playerctl ];
-
- # services.spotifyd = {
- # enable = true;
- #
- # package = (pkgs.spotifyd.override { withMpris = true; });
- #
- # settings = {
- # global = {
- # username = "9nko3f7puya1e5bbo9c5ifddy";
- # password_cmd = "${pkgs.pass}/bin/pass www/spotify.com | head -n1";
- # };
- # };
- # };
- #
- # programs.spotify-tui = {
- # enable = true;
- #
- # settings = {
- # theme = {
- # active = "Cyan";
- # banner = "LightCyan";
- # };
- #
- # behavior = {
- # seek_milliseconds = 5000;
- # volume_increment = 10;
- # };
- # };
- # };
-
- nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" ];
- };
-}
diff --git a/home/modules/profiles/base/config/dunst.nix b/home/profiles/base/config/dunst.nix
index 60ed15f..60ed15f 100644
--- a/home/modules/profiles/base/config/dunst.nix
+++ b/home/profiles/base/config/dunst.nix
diff --git a/home/modules/profiles/base/config/foot.nix b/home/profiles/base/config/foot.nix
index 08a38e7..08a38e7 100644
--- a/home/modules/profiles/base/config/foot.nix
+++ b/home/profiles/base/config/foot.nix
diff --git a/home/modules/profiles/base/config/sway.nix b/home/profiles/base/config/sway.nix
index 00dae28..00dae28 100644
--- a/home/modules/profiles/base/config/sway.nix
+++ b/home/profiles/base/config/sway.nix
diff --git a/home/profiles/base/config/waybar-settings.nix b/home/profiles/base/config/waybar-settings.nix
new file mode 100644
index 0000000..089fefb
--- /dev/null
+++ b/home/profiles/base/config/waybar-settings.nix
@@ -0,0 +1,54 @@
+{ neotheme }:
+
+with neotheme.colors;
+{
+ layer = "bottom";
+ position = "top";
+ height = 21;
+ modules-left = [ "pulseaudio" "custom/seperator" "cpu" "custom/seperator" "memory" ];
+ modules-center = [ "sway/workspaces" ];
+ modules-right = [ "clock" ];
+
+ "sway/workspaces" = {
+ all-outputs = true;
+ persistent_workspaces = {
+ "α" = [ ];
+ "β" = [ ];
+ "γ" = [ ];
+ "δ" = [ ];
+ "ε" = [ ];
+ "ζ" = [ ];
+ "η" = [ ];
+ "θ" = [ ];
+ "ι" = [ ];
+ "κ" = [ ];
+ };
+ };
+
+ "clock" = {
+ interval = 10;
+ format = "<span foreground='#${color5}'></span> {:%A, %b %d %H:%M}";
+ };
+
+ "cpu" = {
+ interval = 5;
+ format = "<span foreground='#${color2}'></span> {usage:3}%";
+ };
+
+ "pulseaudio" = {
+ format = "<span foreground='#${color4}'>{icon}</span> {volume}%";
+ format-muted = "ﱝ Muted";
+ format-icons.default = [ " " " " " " ];
+ };
+
+ "memory" = {
+ interval = 5;
+ format = "<span foreground='#${color3}'>﬙</span> {used:0.2f}GiB";
+ };
+
+ "custom/seperator" = {
+ format = "|";
+ interval = "once";
+ tooltip = false;
+ };
+}
diff --git a/home/modules/profiles/base/config/waybar-style.nix b/home/profiles/base/config/waybar-style.nix
index e3f30f6..0901a6a 100644
--- a/home/modules/profiles/base/config/waybar-style.nix
+++ b/home/profiles/base/config/waybar-style.nix
@@ -70,7 +70,7 @@ with neotheme.colors;
}
#custom-seperator {
- color: #${bright0};
+ color: #${alt1};
background-color: #${background};
border-bottom: 1px solid #${bright0};
}
diff --git a/home/modules/profiles/base/default.nix b/home/profiles/base/default.nix
index 3d75618..7b62442 100644
--- a/home/modules/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -5,14 +5,19 @@ let
neotheme = config.neotheme;
inherit (self.packages.x86_64-linux) neovim iosevka-pure-bin phocus;
-
- inherit (self.non-flake) wallpapers;
in
{
+ imports = [
+ ../../modules/programs/nixpkgs
+ ../../modules/programs/zshell
+ ../../modules/misc/neotheme
+ ];
+
options.profiles.base.enable = lib.mkEnableOption
"The base profile, should be always enabled";
config = lib.mkIf cfg.enable {
+
home.sessionVariables = rec {
EDITOR = "nvim";
VISUAL = "nvim";
@@ -54,12 +59,13 @@ in
bright7 = "e4e4db";
};
- wallpaper = "${wallpapers}/nixos/nix-glow-fg-d4ae80.png";
+ wallpaper = "${self.inputs.wallpapers}/nixos/nix-glow-fg-d4ae80.png";
};
home.keyboard.layout = "us";
home.packages = [
pkgs.hydra-check
+ pkgs.sops
neovim
# Fonts
@@ -74,6 +80,8 @@ in
(pkgs.nerdfonts.override { fonts = [ "Iosevka" "JetBrainsMono" ]; })
];
+ fonts.fontconfig.enable = true;
+
wayland.windowManager.sway = {
enable = true;
diff --git a/home/modules/profiles/base/p10k-config/p10k.zsh b/home/profiles/base/p10k-config/p10k.zsh
index aa6bc2c..aa6bc2c 100644
--- a/home/modules/profiles/base/p10k-config/p10k.zsh
+++ b/home/profiles/base/p10k-config/p10k.zsh
diff --git a/home/modules/profiles/browsing/default.nix b/home/profiles/browsing/default.nix
index 86f3cc1..86f3cc1 100644
--- a/home/modules/profiles/browsing/default.nix
+++ b/home/profiles/browsing/default.nix
diff --git a/home/modules/profiles/browsing/qutebrowser-settings.nix b/home/profiles/browsing/qutebrowser-settings.nix
index 0d7fa07..4486d0f 100644
--- a/home/modules/profiles/browsing/qutebrowser-settings.nix
+++ b/home/profiles/browsing/qutebrowser-settings.nix
@@ -8,7 +8,7 @@ let
base04 = "#090a10";
base05 = "#cbc0ab";
base06 = "#e0d6bd";
- base07 = "#27282e";
+ base07 = "#4f5058";
base08 = "#b17f81";
base09 = "#e9b189";
base0A = "#d4ae80";
@@ -292,13 +292,13 @@ in
colors.tabs.selected.odd.fg = base05;
# Background color of selected odd tabs.
- colors.tabs.selected.odd.bg = base02;
+ colors.tabs.selected.odd.bg = base07;
# Foreground color of selected even tabs.
colors.tabs.selected.even.fg = base05;
# Background color of selected even tabs.
- colors.tabs.selected.even.bg = base02;
+ colors.tabs.selected.even.bg = base07;
# Background color for webpages if unset (or empty to use the theme's
# color).
diff --git a/home/modules/profiles/default.nix b/home/profiles/default.nix
index af9d9a8..af9d9a8 100644
--- a/home/modules/profiles/default.nix
+++ b/home/profiles/default.nix
diff --git a/home/modules/profiles/development/default.nix b/home/profiles/development/default.nix
index 75f482f..b0b8309 100644
--- a/home/modules/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -2,8 +2,6 @@
let
cfg = config.profiles.development;
-
- inherit (self.packages.x86_64-linux) rust-nightly;
in
{
options.profiles.development = {
@@ -68,14 +66,16 @@ in
home.packages = [
pkgs.bfg-repo-cleaner
+ pkgs.diffoscopeMinimal
# Fix gpg not recognizing foot terminfo
pkgs.foot.terminfo
+ pkgs.jq
+ pkgs.nixpkgs-fmt
+ pkgs.nixpkgs-review
pkgs.ripgrep
pkgs.rust-analyzer
- rust-nightly
+ (pkgs.rust-bin.nightly.latest.default.override { extensions = [ "rust-src" ]; })
pkgs.tig
- pkgs.silver-searcher
- pkgs.diffoscopeMinimal
];
services.gpg-agent = {
diff --git a/home/modules/profiles/messaging/default.nix b/home/profiles/messaging/default.nix
index 76dc0fc..a25f4e1 100644
--- a/home/modules/profiles/messaging/default.nix
+++ b/home/profiles/messaging/default.nix
@@ -2,6 +2,8 @@
let cfg = config.profiles.messaging;
in
{
+ imports = [ ../../modules/programs/nixpkgs ];
+
options.profiles.messaging = {
enable = lib.mkEnableOption
"A profile that enables the system to communicate via internet.";
@@ -9,6 +11,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ discord-canary aerc weechat element slack ];
+
nixpkgs.allowedUnfree = [ "discord-canary" "slack" ];
};
}
diff --git a/home/profiles/multimedia/default.nix b/home/profiles/multimedia/default.nix
new file mode 100644
index 0000000..0554258
--- /dev/n