servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Add all nix config with device gates

Browse Source
This commit is contained in:
Uttarayan Mondal
2024-02-19 19:14:09 +05:30
parent 935043e290
commit 0fc1c8b054
14 changed files with 135 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/nix/Makefile
View File

@@ -3,8 +3,7 @@
default: nixos
darwin:
# nix run nix-darwin -- switch --flake ~/.local/share/dotfiles/config/nix
nix run nix-darwin -- switch --flake .
nix run nix-darwin -- switch --flake . --show-trace
home:
nix --extra-experimental-features "nix-command flakes" run home-manager/master -- switch --flake .

2
config/nix/common/firefox.nix
View File

@@ -1 +1 @@
{pkgs, ...}: {programs.firefox = {enable = pkgs.stdenv.isLinux;};}
{ device, ... }: { programs.firefox = { enable = device.isLinux; }; }

94
config/nix/common/home.nix
View File

@@ -1,10 +1,5 @@
{
config,
pkgs,
lib,
device,
...
}: let
{ config, pkgs, lib, device, ... }:
let
start-tmux = (import ../scripts/start-tmux.nix) pkgs;
# https://mipmip.github.io/home-manager-option-search/
in {
@@ -12,12 +7,10 @@ in {
# Include the results of the hardware scan.
./tmux.nix
./wezterm.nix
./firefox.nix
../linux/hyprland.nix
../linux/gtk.nix
../linux/anyrun.nix
../linux/ironbar.nix
];
] ++ (if device.isLinux then [
../linux
] else
[ ]);
home.packages = with pkgs;
[
@@ -38,46 +31,25 @@ in {
clang
# neovim-nightly
neovim
(nerdfonts.override {fonts = ["Hasklig"];})
(nerdfonts.override { fonts = [ "Hasklig" ]; })
mpv
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
]
++ (
if device.isLinux
then
with pkgs; [
handlr-regex
gnome.nautilus
webcord-vencord
spotify
spotify-player
lsof
wl-clipboard
yubikey-personalization
ncpamixer
yubikey-agent
(pkgs.writeShellApplication {
name = "xdg-open";
runtimeInputs = [handlr-regex];
text = ''
handlr open "$@"
'';
})
]
else []
);
] ++ (if device.isLinux then [
handlr-regex
webcord-vencord
spotify
spotify-player
lsof
wl-clipboard
ncpamixer
(pkgs.writeShellApplication {
name = "xdg-open";
runtimeInputs = [ handlr-regex ];
text = ''
handlr open "$@"
'';
})
] else
[ ]);
xdg.enable = true;
@@ -109,7 +81,7 @@ in {
nushell = {
enable = true;
shellAliases = {"cd" = "z";};
shellAliases = { "cd" = "z"; };
package = pkgs.nushellFull;
configFile.text = ''
$env.config = {
@@ -144,12 +116,6 @@ in {
enableFishIntegration = true;
tmux.enableShellIntegration = true;
};
# keychain = {
# enable = pkgs.isLinux;
# keys = [ "id_ed25519" ];
# enableFishIntegration = true;
# enableNushellIntegration = true;
# };
yazi = {
enable = true;
enableFishIntegration = true;
@@ -157,7 +123,7 @@ in {
};
# Let Home Manager install and manage itself.
home-manager = {enable = true;};
home-manager = { enable = true; };
};
fonts.fontconfig.enable = true;
@@ -165,10 +131,10 @@ in {
# Home Manager needs a bit of information about you and the paths it should
# manage.
username = device.user;
homeDirectory =
if device.isMac
then lib.mkForce "/Users/${device.user}"
else lib.mkForce "/home/${device.user}";
homeDirectory = if device.isMac then
lib.mkForce "/Users/${device.user}"
else
lib.mkForce "/home/${device.user}";
stateVersion = "23.11";

0
config/nix/darwin/default.nix → config/nix/darwin/device.nix
View File

6
config/nix/flake.nix
View File

@@ -105,17 +105,17 @@
# overlays = [ anyrun-overlay ];
in {
nixosConfigurations = let devices = nixos_devices;
in import ./nixos {
in import ./nixos/device.nix {
inherit devices inputs nixpkgs home-manager overlays;
};
darwinConfigurations = let devices = darwin_devices;
in import ./darwin {
in import ./darwin/device.nix {
inherit devices inputs nixpkgs home-manager overlays nix-darwin;
};
homeConfigurations = let devices = linux_devices;
in import ./linux {
in import ./linux/device.nix {
inherit devices inputs nixpkgs home-manager overlays;
};
};

47
config/nix/linux/anyrun.nix
View File

@@ -1,20 +1,12 @@
{
inputs,
pkgs,
osConfig,
...
}: {
imports =
if pkgs.stdenv.isLinux
then [inputs.anyrun.nixosModules.home-manager]
else [];
{ inputs, pkgs, osConfig, ... }: {
imports = [ inputs.anyrun.nixosModules.home-manager ];
programs.anyrun = {
enable = pkgs.stdenv.isLinux;
enable = true;
config = {
plugins = with inputs.anyrun.packages.${pkgs.system}; [
inputs.anyrun-nixos-options.packages.${pkgs.system}.default
inputs.anyrun-hyprwin.packages.${pkgs.system}.default
# inputs.anyrun-rink.packages.${pkgs.system}.default
inputs.anyrun-rink.packages.${pkgs.system}.default
# rink
applications
websearch
@@ -23,10 +15,10 @@
symbols
kidex
];
x = {fraction = 0.5;};
y = {fraction = 0.3;};
height = {absolute = 0;};
width = {absolute = 1000;};
x = { fraction = 0.5; };
y = { fraction = 0.3; };
height = { absolute = 0; };
width = { absolute = 1000; };
showResultsImmediately = true;
maxEntries = 10;
layer = "overlay";
@@ -34,11 +26,9 @@
extraConfigFiles = {
"nixos-options.ron".text = let
nixos-options =
osConfig.system.build.manual.optionsJSON
nixos-options = osConfig.system.build.manual.optionsJSON
+ "/share/doc/nixos/options.json";
hm-options =
inputs.home-manager.packages.${pkgs.system}.docs-json
hm-options = inputs.home-manager.packages.${pkgs.system}.docs-json
+ "/share/doc/home-manager/options.json";
# or alternatively if you wish to read any other documentation options, such as home-manager
# get the docs-json package from the home-manager flake
@@ -50,9 +40,10 @@
# ":nall" = [nixos-options hm-options some-other-option];
# };
options = builtins.toJSON {
":nix" = [nixos-options];
":hm" = [hm-options];
":nix" = [ nixos-options ];
":hm" = [ hm-options ];
};
in ''
Config(
options: ${options},
@@ -89,12 +80,12 @@
"rink.ron".text = ''
Config(
currency: Some("${
builtins.toFile "currency.units" ''
!category currencies "Currencies"
usd USD
inr INR
''
}"),
builtins.toFile "currency.units" ''
!category currencies "Currencies"
usd USD
inr INR
''
}"),
)
'';
};

26
config/nix/linux/default.nix
View File

@@ -1,17 +1,9 @@
{ devices, inputs, overlays, home-manager, ... }:
builtins.listToAttrs (builtins.map (device: {
name = device.user;
value = let
pkgs = import inputs.nixpkgs {
inherit overlays;
system = device.system;
};
in home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
inherit device;
};
modules = [ ../common/home.nix ];
};
}) devices)
{ pkgs, ... }: {
imports = [
../common/firefox.nix
../linux/hyprland.nix
../linux/gtk.nix
../linux/anyrun.nix
../linux/ironbar.nix
];
}

17
config/nix/linux/device.nix Normal file
View File

@@ -0,0 +1,17 @@
{ devices, inputs, overlays, home-manager, ... }:
builtins.listToAttrs (builtins.map (device: {
name = device.user;
value = let
pkgs = import inputs.nixpkgs {
inherit overlays;
system = device.system;
};
in home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
inherit device;
};
modules = [ ../common/home.nix ];
};
}) devices)

2
config/nix/linux/foot.nix
View File

@@ -1,4 +1,4 @@
{pkgs, ...}: {
{ pkgs, ... }: {
foot = {
enable = pkgs.stdenv.isLinux;
server.enable = true;

42
config/nix/linux/gtk.nix
View File

@@ -1,26 +1,28 @@
{pkgs, ...}: {
programs.gtk = {
enable = pkgs.stdenv.isLinux;
theme = {
name = "Catppuccin-Mocha-Standard-Mauve-Dark";
package = pkgs.catppuccin-gtk.override {
variant = "mocha";
size = "standard";
accents = ["mauve"];
tweaks = ["normal"];
{ pkgs, ... }: {
programs = {
gtk = {
enable = true;
theme = {
name = "Catppuccin-Mocha-Standard-Mauve-Dark";
package = pkgs.catppuccin-gtk.override {
variant = "mocha";
size = "standard";
accents = [ "mauve" ];
tweaks = [ "normal" ];
};
};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
accent = "mauve";
flavor = "mocha";
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
accent = "mauve";
flavor = "mocha";
};
};
gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; };
gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; };
};
gtk3.extraConfig = {gtk-application-prefer-dark-theme = 1;};
gtk4.extraConfig = {gtk-application-prefer-dark-theme = 1;};
};
}

4
config/nix/linux/hyprland.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, ... }: {
{ ... }: {
wayland.windowManager.hyprland = {
enable = pkgs.stdenv.isLinux;
enable = true;
settings = {
monitor = [
",preferred,auto,auto"

57
config/nix/linux/ironbar.nix
View File

@@ -1,25 +1,18 @@
{
pkgs,
inputs,
...
}: {
imports =
if pkgs.stdenv.isLinux
then [inputs.ironbar.homeManagerModules.default]
else [];
{ inputs, ... }: {
imports = [ inputs.ironbar.homeManagerModules.default ];
programs.ironbar = {
enable = pkgs.stdenv.isLinux;
enable = true;
config.monitors = {
HDMI-A-2 = {
position = "bottom";
start = [
{
type = "launcher";
favourites = ["firefox" "discord"];
favourites = [ "firefox" "discord" ];
show_names = false;
show_icons = true;
}
{type = "focused";}
{ type = "focused"; }
];
end = [
{
@@ -32,7 +25,7 @@
type = "music";
player_type = "mpris";
}
{type = "clock";}
{ type = "clock"; }
];
};
DP-1 = {
@@ -57,27 +50,25 @@
# networks= 3;
};
}
{type = "tray";}
];
start = [
{
type = "workspaces";
name_map = {
"1" = "icon:code";
"2" = "";
"3" = "icon:chrome";
"4" = "icon:discord";
"5" = "icon:steam";
"6" = "icon:misc";
"7" = "icon:misc";
"8" = "icon:docky";
"9" = "icon:monodoc";
"10" = "icon:spotify";
};
favorites = ["1" "2" "3" "4" "5" "6" "7" "8" "9" "10"];
all_monitors = true;
}
{ type = "tray"; }
];
start = [{
type = "workspaces";
name_map = {
"1" = "icon:code";
"2" = "";
"3" = "icon:chrome";
"4" = "icon:discord";
"5" = "icon:steam";
"6" = "icon:misc";
"7" = "icon:misc";
"8" = "icon:docky";
"9" = "icon:monodoc";
"10" = "icon:spotify";
};
favorites = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "10" ];
all_monitors = true;
}];
};
};
style = ''

12
config/nix/nixos/configuration.nix
View File

@@ -9,12 +9,12 @@
environment.etc = {
"wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
}
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
}
'';
};

0
config/nix/nixos/default.nix → config/nix/nixos/device.nix
View File