Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f56681bf4 | |||
| cc10297ac9 | |||
| e4339e2888 | |||
| f0997da7cb | |||
| 6b7b6fae5f | |||
| 11f55be973 | |||
| cb2300949a | |||
| 895a55953e | |||
| 1a3049ff6d | |||
| 0ced40eb36 | |||
| a825aa221c | |||
| 7f433f4946 | |||
| 2c9a4a7ec2 | |||
| 160560afe1 | |||
| 5e41844415 | |||
| 49a2d35d02 | |||
| b11c681e62 | |||
| 06aaf21de1 |
File diff suppressed because it is too large
Load Diff
+68
-58
@@ -138,6 +138,7 @@ Machine-specific NixOS configurations (e.g., =configuration.nix= for =maindroid=
|
||||
|
||||
This section contains the Org blocks for tangling Nix code into the generated folders.
|
||||
|
||||
|
||||
** =flake.nix=
|
||||
The Nix flake definition for Droidnix.
|
||||
#+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
@@ -150,14 +151,14 @@ The Nix flake definition for Droidnix.
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catppuccin = {
|
||||
url = "github:catppuccin/nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
zen-browser = {
|
||||
url = "github:youwen5/zen-browser-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -195,7 +196,7 @@ outputs =
|
||||
# Import machine-specific configurations
|
||||
./generated/out_of_tree/machines/traveldroid/top.nix
|
||||
# Catppuccin theme module
|
||||
inputs.catppuccin.nixosModules.catppuccin
|
||||
catppuccin.nixosModules.catppuccin
|
||||
# Anchoring all the other nixes
|
||||
./generated/top.nix
|
||||
# Home Manager module
|
||||
@@ -314,7 +315,6 @@ mkShell {
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
|
||||
** =generated/out_of_tree/machines/traveldroid/top.nix=
|
||||
This is the top of the machine hierarchy
|
||||
#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/top.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
@@ -338,15 +338,8 @@ This is the top of the machine hierarchy
|
||||
./xdg.nix
|
||||
./session.nix
|
||||
./networking.nix
|
||||
./gtk.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.catppuccin.nixosModules.default
|
||||
];
|
||||
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavor = "mocha";
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
@@ -804,6 +797,7 @@ This is top file of this level which contains just an import statement for all r
|
||||
./packages.nix
|
||||
./flatpaks.nix
|
||||
./accessibility/top.nix
|
||||
./browsing/top.nix
|
||||
./file_management/top.nix
|
||||
./gaming/top.nix
|
||||
./media_playback_editing/top.nix
|
||||
@@ -814,6 +808,35 @@ This is top file of this level which contains just an import statement for all r
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** =generated/system/applications/browsing/top.nix=
|
||||
This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
|
||||
#+BEGIN_SRC nix :tangle generated/system/applications/browsing/top.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
{ config, pkgs, lib, user, inputs, flakeRoot,... }:
|
||||
{
|
||||
imports = [
|
||||
./zen-browser.nix
|
||||
# ./firefox.nix
|
||||
# ./vivaldi.nix
|
||||
];
|
||||
#+END_SRC
|
||||
|
||||
** =generated/system/applications/browsing/top.nix=
|
||||
This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
|
||||
#+BEGIN_SRC nix :tangle generated/system/applications/browsing/top.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
profile = {
|
||||
settings = {
|
||||
"widget.non-native-theme.enabled" = false;
|
||||
"widget.dmab.hidpi.enabled" = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** =generated/system/applications/packages.nix=
|
||||
This will import all packages listed in ./assets/system/apps/packlages.conf
|
||||
#+BEGIN_SRC nix :tangle generated/system/applications/packages.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
@@ -849,18 +872,7 @@ let
|
||||
packages.conf : ${toString packagesConfPath}
|
||||
Hint : check the attribute name on search.nixos.org/packages
|
||||
''
|
||||
else
|
||||
found;
|
||||
packages = builtins.seq _guard (map resolvePkg entries);
|
||||
zenBrowser =
|
||||
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
in
|
||||
{
|
||||
environment.systemPackages =
|
||||
packages
|
||||
++ [ zenBrowser ];
|
||||
}
|
||||
|
||||
#+END_SRC
|
||||
|
||||
** =generated/system/applications/flatpaks.nix=
|
||||
@@ -992,10 +1004,41 @@ This is top file of this level which contains just an import statement for all r
|
||||
./login-tuigreeter.nix
|
||||
#./login-lightdm.nix
|
||||
./fonts.nix
|
||||
./gtk.nix
|
||||
];
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** =generated/system/core/gtk.nix=
|
||||
I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
|
||||
You'll notice the color values in multiple places outside this as well.
|
||||
#+BEGIN_SRC nix :tangle generated/system/core/gtk.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
{ pkgs, user, ... }:
|
||||
{
|
||||
home-manager.users.${user.username} = {
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Catppuccin-Mocha-Standard-Blue-Dark";
|
||||
package = pkgs.magnetic-catppuccin-gtk;
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
|
||||
** =generated/system/core/fonts.nix=
|
||||
This file installs and configures fonts
|
||||
#+BEGIN_SRC nix :tangle generated/system/core/fonts.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
@@ -1118,20 +1161,6 @@ This file sets up wayland
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** =generated/out_of_tree/machines/traveldroid/gtk.nix=
|
||||
This file configures gtk
|
||||
#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/gtk.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
{ pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
papirus-icon-theme
|
||||
];
|
||||
|
||||
#SEE SESSIONS.NIX FOR SESSION VARIABLES
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** =generated/system/development/top.nix=
|
||||
This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
|
||||
#+BEGIN_SRC nix :tangle generated/system/development/top.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
@@ -1212,26 +1241,7 @@ in
|
||||
{
|
||||
home-manager.users.${username} = {
|
||||
|
||||
# GTK icon theme: Papirus + Catppuccin Mocha
|
||||
gtk.enable = true;
|
||||
gtk.gtk3.iconTheme.name = "Papirus";
|
||||
gtk.gtk4.iconTheme.name = "Papirus";
|
||||
|
||||
# Catppuccin Mocha dark theme
|
||||
xdg.configFile."gtk-3.0/settings.ini".text = ''
|
||||
[Settings]
|
||||
gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
|
||||
gtk-icon-theme-name=Papirus
|
||||
gtk-application-prefer-dark-theme=1
|
||||
'';
|
||||
xdg.configFile."gtk-4.0/settings.ini".text = ''
|
||||
[Settings]
|
||||
gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
|
||||
gtk-icon-theme-name=Papirus
|
||||
gtk-application-prefer-dark-theme=1
|
||||
'';
|
||||
|
||||
# Thunar and plugins
|
||||
# Thunar and plugins
|
||||
home.packages = with pkgs; [
|
||||
thunar
|
||||
thunar-volman
|
||||
|
||||
+59
-61
@@ -7,15 +7,14 @@
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catppuccin = {
|
||||
url = "github:catppuccin/nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
zen-browser = {
|
||||
url = "github:youwen5/zen-browser-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -23,63 +22,62 @@
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
emacs-overlay,
|
||||
catppuccin,
|
||||
zen-browser,
|
||||
hyprland,
|
||||
...
|
||||
}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
system = "x86_64-linux";
|
||||
user = import ./generated/out_of_tree/users/henrov.nix;
|
||||
machines = [
|
||||
"traveldroid"
|
||||
"maindroid"
|
||||
];
|
||||
flakeRoot = ./.; # Define flakeRoot here
|
||||
in
|
||||
{
|
||||
nixosConfigurations = lib.genAttrs machines (
|
||||
machine:
|
||||
lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
# Import machine-specific configurations
|
||||
./generated/out_of_tree/machines/traveldroid/top.nix
|
||||
# Catppuccin theme module
|
||||
inputs.catppuccin.nixosModules.default
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
emacs-overlay,
|
||||
catppuccin,
|
||||
zen-browser,
|
||||
hyprland,
|
||||
...
|
||||
}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
system = "x86_64-linux";
|
||||
user = import ./generated/out_of_tree/users/henrov.nix;
|
||||
machines = [
|
||||
"traveldroid"
|
||||
"maindroid"
|
||||
];
|
||||
flakeRoot = ./.; # Define flakeRoot here
|
||||
in
|
||||
{
|
||||
nixosConfigurations = lib.genAttrs machines (
|
||||
machine:
|
||||
lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
# Import machine-specific configurations
|
||||
./generated/out_of_tree/machines/traveldroid/top.nix
|
||||
# Catppuccin theme module
|
||||
catppuccin.nixosModules.catppuccin
|
||||
# Anchoring all the other nixes
|
||||
./generated/top.nix
|
||||
# Home Manager module
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
|
||||
}
|
||||
];
|
||||
specialArgs = { inherit user inputs flakeRoot; };
|
||||
}
|
||||
);
|
||||
|
||||
# Anchoring all the other nixes
|
||||
./generated/top.nix
|
||||
# Home Manager module
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
|
||||
}
|
||||
];
|
||||
specialArgs = { inherit user inputs flakeRoot; };
|
||||
}
|
||||
);
|
||||
homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
|
||||
userMachine:
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit system;
|
||||
configuration = import ./user.nix { inherit inputs user flakeRoot; };
|
||||
extraSpecialArgs = { inherit user inputs flakeRoot; };
|
||||
}
|
||||
);
|
||||
|
||||
homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
|
||||
userMachine:
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit system;
|
||||
configuration = import ./user.nix { inherit inputs user flakeRoot; };
|
||||
extraSpecialArgs = { inherit user inputs flakeRoot; };
|
||||
}
|
||||
);
|
||||
|
||||
devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
|
||||
inherit (nixpkgs.legacyPackages.${system}) mkShell;
|
||||
};
|
||||
devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
|
||||
inherit (nixpkgs.legacyPackages.${system}) mkShell;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{ pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
papirus-icon-theme
|
||||
];
|
||||
|
||||
#SEE SESSIONS.NIX FOR SESSION VARIABLES
|
||||
}
|
||||
@@ -18,7 +18,6 @@
|
||||
./xdg.nix
|
||||
./session.nix
|
||||
./networking.nix
|
||||
./gtk.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
}
|
||||
|
||||
@@ -11,26 +11,7 @@ in
|
||||
{
|
||||
home-manager.users.${username} = {
|
||||
|
||||
# GTK icon theme: Papirus + Catppuccin Mocha
|
||||
gtk.enable = true;
|
||||
gtk.gtk3.iconTheme.name = "Papirus";
|
||||
gtk.gtk4.iconTheme.name = "Papirus";
|
||||
|
||||
# Catppuccin Mocha dark theme
|
||||
xdg.configFile."gtk-3.0/settings.ini".text = ''
|
||||
[Settings]
|
||||
gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
|
||||
gtk-icon-theme-name=Papirus
|
||||
gtk-application-prefer-dark-theme=1
|
||||
'';
|
||||
xdg.configFile."gtk-4.0/settings.ini".text = ''
|
||||
[Settings]
|
||||
gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
|
||||
gtk-icon-theme-name=Papirus
|
||||
gtk-application-prefer-dark-theme=1
|
||||
'';
|
||||
|
||||
# Thunar and plugins
|
||||
# Thunar and plugins
|
||||
home.packages = with pkgs; [
|
||||
thunar
|
||||
thunar-volman
|
||||
|
||||
@@ -1,18 +1,23 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{ pkgs, user, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
catppuccin.gtk.mocha.standard.blue
|
||||
papirus-icon-theme
|
||||
];
|
||||
home-manager.users.${user.username} = {
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Catppuccin-Mocha-Standard-Blue-Dark";
|
||||
package = pkgs.magnetic-catppuccin-gtk;
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
|
||||
programs.gtk = {
|
||||
enable = true;
|
||||
gtk3.enable = true;
|
||||
theme.name = "Catppuccin-Mocha-Standard-Blue-Dark";
|
||||
theme.variant = "dark";
|
||||
iconTheme.name = "Papirus-Dark";
|
||||
};
|
||||
|
||||
# Check session.nix for variables !
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ pkgs, ...}:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
magnetic-catppuccin-gtk
|
||||
];
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Catppuccin-Mocha-Standard-Blue-Dark";
|
||||
package = pkgs.magnetic-catppuccin-gtk;
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
|
||||
catppuccin.enable = true;
|
||||
catppuccin.flavor = "mocha";
|
||||
catppuccin.accent = "blue";
|
||||
catppuccin.gtk.icon.enable = true;
|
||||
catppuccin.cursors.enable = true;
|
||||
}
|
||||
@@ -7,5 +7,6 @@
|
||||
./login-tuigreeter.nix
|
||||
#./login-lightdm.nix
|
||||
./fonts.nix
|
||||
./gtk.nix
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user