adriangl
/
nix-dotfiles
mirror of https://github.com/adrlau/nix-dotfiles.git
1
2
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: adriangl:a34f88aa05c447d12b54bbf43819873d6a658c7b
Branches Tags
adriangl:main
adriangl:sway-fixes
..
compare: adriangl:b0248a88815c2015dd0ee0144df69745a4c014cd
Branches Tags
adriangl:main
adriangl:sway-fixes

No commits in common. "a34f88aa05c447d12b54bbf43819873d6a658c7b" and "b0248a88815c2015dd0ee0144df69745a4c014cd" have entirely different histories.
a34f88aa05 ... b0248a8881

12 changed files with 130 additions and 334 deletions
Show Stats Expand all files Collapse all files

214
flake.lock
View File

@ -1,119 +1,5 @@
{ {
"nodes": { "nodes": {
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1708890466,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"type": "github"
}
},
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"type": "github"
}
},
"base16-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1663659192,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
"owner": "chriskempson",
"repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
"type": "github"
},
"original": {
"owner": "chriskempson",
"repo": "base16-vim",
"type": "github"
}
},
"devenv": { "devenv": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -189,22 +75,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"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-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -241,22 +111,6 @@
"type": "github" "type": "github"
} }
}, },
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -280,23 +134,6 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1698794309,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "45.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -397,22 +234,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"locked": {
"lastModified": 1725885300,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706098335, "lastModified": 1706098335,
@ -601,12 +422,10 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"matrix-synapse-next": "matrix-synapse-next", "matrix-synapse-next": "matrix-synapse-next",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"ozai": "ozai", "ozai": "ozai",
"ozai-webui": "ozai-webui", "ozai-webui": "ozai-webui",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix",
"unstable": "unstable" "unstable": "unstable"
} }
}, },
@ -648,39 +467,6 @@
"type": "github" "type": "github"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_3",
"gnome-shell": "gnome-shell",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713897030,
"narHash": "sha256-ZPr1R0d9MVmyRX/+XpYsBdLBEBqYMtuyaAjYgWHMloU=",
"owner": "bluskript",
"repo": "stylix",
"rev": "6bc871ab352c9f18d1179daab9e392a4d46393af",
"type": "github"
},
"original": {
"owner": "bluskript",
"repo": "stylix",
"rev": "6bc871ab352c9f18d1179daab9e392a4d46393af",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

30
flake.nix
View File

@ -8,7 +8,9 @@
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = "github:misterio77/nix-colors"; stylix.url = "github:bluskript/stylix/6bc871ab352c9f18d1179daab9e392a4d46393af";
stylix.inputs.nixpkgs.follows = "nixpkgs";
stylix.inputs.home-manager.follows = "home-manager";
ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git"; ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git";
ozai.inputs.nixpkgs.follows = "unstable"; ozai.inputs.nixpkgs.follows = "unstable";
@ -30,7 +32,7 @@
outputs = { outputs = {
self self
, home-manager , home-manager
, nix-colors , stylix
, matrix-synapse-next , matrix-synapse-next
, ozai , ozai
, ozai-webui , ozai-webui
@ -47,6 +49,26 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
boromir = nixpkgs.lib.nixosSystem {
system = "x84_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
# Overlays-module makes "pkgs.unstable" available in configuration.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./machines/boromir/configuration.nix
sops-nix.nixosModules.sops
nixos-hardware.nixosModules.lenovo-thinkpad-p1
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."gunalx" = import ./home/full.nix;
}
];
};
eowyn = nixpkgs.lib.nixosSystem { eowyn = nixpkgs.lib.nixosSystem {
system = "x84_64-linux"; system = "x84_64-linux";
@ -63,8 +85,10 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users."gunalx" = import ./home/full.nix; home-manager.users."gunalx" = import ./home/full.nix;
home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
} }
#need to choose one. The nixos one has bootloader and display manager in addition to the home manager one.
#inputs.stylix.nixosModules.stylix
#inputs.stylix.homeManagerModules.stylix
]; ];
}; };

13
home/base.nix
View File

@ -1,7 +1,6 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
./sshconfig.nix
]; ];
programs.nix-index = { programs.nix-index = {
@ -19,23 +18,17 @@
shellAliases = { shellAliases = {
"rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade"; "rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade";
"nixedit" = "vim /etc/nixos/nix-dotfiles/."; "nixedit" = "vim /etc/nixos/nix-dotfiles/.";
"nixdir" = "cd /etc/nixos/nix-dotfiles";
"," = "comma "; "," = "comma ";
"gst" = "git status"; "gst" = "git status";
"gsw" = "git switch"; "gsw" = "git switch";
"gcm" = "git commit -m "; "gcm" = "git commit -m ";
"gca" = "git commit --amend"; "gca" = "git commit --amend";
"gaa" = "git add -A"; "gaa" = "git add -A";
"gb" = "git branch"; "gb" = "git branch";
"sl" = "eza"; "sl" = "eza";
"ls" = "eza"; "ls" = "eza";
"lls" = "ls"; "lls" = "ls";
"la" = "eza -la"; "la" = "eza -la";
"tree" = "eza -T";
"neofetch" = "fastfetch"; "neofetch" = "fastfetch";
}; };
historyControl = ["ignoreboth" "erasedups"]; historyControl = ["ignoreboth" "erasedups"];
@ -76,6 +69,12 @@
]; ];
}; };
home.stateVersion = "23.05"; home.stateVersion = "23.05";
} }

52
home/colors.nix
View File

@ -1,52 +0,0 @@
{ pkgs, config, nix-colors, ... }: {
imports = [
nix-colors.homeManagerModules.default
];
colorScheme = {
slug = "cyberpunk-apathy-adjusted";
name = "Cyberpunk Apathy Adjusted";
author = "Adrian G L (based on Apathy by Jannik Siebert)";
palette = {
base00 = "031A16"; # Background (kept original)
base01 = "2A6D62"; # Lighter Background (brighter)
base02 = "3D9F87"; # Selection Background (brighter)
base03 = "68D6A0"; # Comments, Invisibles, Line Highlighting (brighter)
base04 = "99E3D6"; # Dark Foreground (brighter)
base05 = "D1F5E3"; # Default Foreground, Caret, Delimiters, Operators (brighter)
base06 = "E0FCF8"; # Light Foreground (brighter)
base07 = "FFFFFF"; # Light Background (brighter)
base08 = "D066C2"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted (brighter teal)
base09 = "6FBCDE"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url (brighter blue)
base0A = "7E6BCC"; # Classes, Markup Bold, Search Text Background (brighter purple)
base0B = "6ACB9A"; # Strings, Inherited Class, Markup Code, Diff Inserted (brighter magenta)
base0C = "D26D6E"; # Support, Regular Expressions, Escape Characters, Markup Quotes (slightly adjusted red)
base0D = "E0C964"; # Functions, Methods, Attribute IDs, Headings (brighter yellow)
base0E = "8FCB5F"; # Keywords, Storage, Selector, Markup Italic, Diff Changed (brighter green)
base0F = "6FC8B8"; # Deprecated, Opening/Closing Embedded Language Tags (brighter cyan)
};
};
programs.foot.settings.colors = {
alpha = "0.95"; # Slightly more transparent for a cyberpunk feel
foreground = "${config.colorScheme.palette.base05}";
background = "${config.colorScheme.palette.base00}";
regular0 = "${config.colorScheme.palette.base00}"; # Black
regular1 = "${config.colorScheme.palette.base08}"; # Red (now brighter teal)
regular2 = "${config.colorScheme.palette.base0B}"; # Green
regular3 = "${config.colorScheme.palette.base0A}"; # Yellow
regular4 = "${config.colorScheme.palette.base09}"; # Blue
regular5 = "${config.colorScheme.palette.base0E}"; # Magenta
regular6 = "${config.colorScheme.palette.base0C}"; # Cyan (now slightly adjusted red)
regular7 = "${config.colorScheme.palette.base05}"; # White
bright0 = "${config.colorScheme.palette.base03}"; # Bright Black
bright1 = "${config.colorScheme.palette.base08}"; # Bright Red (now brighter teal)
bright2 = "${config.colorScheme.palette.base0B}"; # Bright Green
bright3 = "${config.colorScheme.palette.base0A}"; # Bright Yellow
bright4 = "${config.colorScheme.palette.base09}"; # Bright Blue
bright5 = "${config.colorScheme.palette.base0E}"; # Bright Magenta
bright6 = "${config.colorScheme.palette.base0C}"; # Bright Cyan (now adjusted red)
bright7 = "${config.colorScheme.palette.base07}"; # Bright White
selection-foreground = "${config.colorScheme.palette.base00}"; # Dark background color for selected text
selection-background = "${config.colorScheme.palette.base0A}"; # Selection color
};
}

23
home/foot.nix
View File

@ -6,7 +6,28 @@
programs.foot.enable = true; programs.foot.enable = true;
programs.foot.settings = { programs.foot.settings = {
##lets stylix handle this instead.
#colors = {
# alpha="0.9";
# foreground="ffffff";
# background="000000";
# regular0="2e3436";
# regular1="cc0000";
# regular2="c4e9a0";
# regular3="cc4a00";
# regular4="c3465a";
# regular5="c75507";
# regular6="c06989";
# regular7="cd3d7c";
# bright0="555753";
# bright1="5ef292";
# bright2="58ae23";
# bright3="5fce94";
# bright4="5729fc";
# bright5="5ad7fa";
# bright6="534e2e";
# bright7="5eeeee";
#};
main = { main = {
term = "xterm-256color"; term = "xterm-256color";
font = "0xproto:size=12"; font = "0xproto:size=12";

3
home/full.nix
View File

@ -4,9 +4,8 @@
./base.nix ./base.nix
./code.nix ./code.nix
./sway.nix ./sway.nix
./colors.nix #./stylix.nix
#inputs.nix-colors.homeManagerModules.default
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
firefox firefox

40
home/kanshi.nix
View File

@ -6,26 +6,26 @@
services.kanshi = { services.kanshi = {
enable = true; enable = true;
settings = [ settings = [
{ { profile.name = "undocked";
profile.name = "undocked"; profile.outputs = [
profile.outputs = [ {
{ criteria = "eDP-1";
criteria = "eDP-1"; }
} ];
]; profile.exec = [
profile.exec = [ "\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 2, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 2, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 3, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 3, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 4, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 4, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 5, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 5, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 6, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 6, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 7, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 7, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 8, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 8, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 9, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 9, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 10, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 10, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 0, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 0, move workspace to eDP-1"
]; ];
} }
]; ];

19
home/sshconfig.nix
View File

@ -1,19 +0,0 @@
{ pkgs, lib, config, ... }:
{
imports = [
];
home.packages = with pkgs; [
openssh
sshfs
];
services.ssh-agent.enable = true;
programs.ssh = {
enable = true;
compression = true;
extraConfig = "";
};
}

47
home/stylix.nix Normal file
View File

@ -0,0 +1,47 @@
{ pkgs, … }:
{
stylix.enable = true;
stylix.image = pkgs.fetchurl {
url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg";
sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50=";
};
stylix.base16Scheme = ”${pkgs.base16-schemes}/share/themes/apathy.yaml”;
# stylix.fonts = {
# monospace = {
# package = pkgs.nerdfonts.override {fonts = [“JetBrainsMono”];};
# name = “JetBrainsMono Nerd Font Mono”;
# };
# sansSerif = {
# package = pkgs.dejavu_fonts;
# name = “DejaVu Sans”;
# };
# serif = {
# package = pkgs.dejavu_fonts;
# name = “DejaVu Serif”;
# };
# };
# stylix.fonts.sizes = {
# applications = 16;
# terminal = 12;
# desktop = 12;
# popups = 12;
# };
stylix.opacity = {
applications = 1.0;
terminal = 0.8;
desktop = 1.0;
popups = 1.0;
};
stylix.polarity = “dark” # “light” or “either”
}

13
home/sway.nix
View File

@ -1,8 +1,7 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
imports = [ imports = [
#./fuzzle.nix ./wofi.nix
#./wofi.nix
./foot.nix ./foot.nix
./fonts.nix ./fonts.nix
./kanshi.nix ./kanshi.nix
@ -50,11 +49,9 @@
swayest-workstyle swayest-workstyle
#launcher #launcher
#wofi wofi
#wofi-emoji wofi-emoji
bemoji bemoji
fuzzel
#screenshots #screenshots
grim grim
@ -111,7 +108,7 @@ in {
config = rec { config = rec {
modifier = "Mod4"; modifier = "Mod4";
terminal = "footclient"; terminal = "footclient";
menu = "fuzzel"; menu = "wofi --show run";
bars = [{ bars = [{
fonts.size = 16.0; fonts.size = 16.0;
command = "waybar"; command = "waybar";

7
profiles/base.nix
View File

@ -70,12 +70,7 @@ imports =
alias lls='ls' alias lls='ls'
''; '';
#TODO: ssh hosts.
#some insecure packages
nixpkgs.config.permittedInsecurePackages = [
"python3.11-youtube-dl-2021.12.17"
];
#nix stuff #nix stuff
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];

3
profiles/desktop.nix
View File

@ -18,8 +18,6 @@ imports =
#libsForQt5.qt5ct #libsForQt5.qt5ct
#qt6Packages.qt6ct #qt6Packages.qt6ct
where-is-my-sddm-theme
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -36,6 +34,7 @@ imports =
ubuntu_font_family ubuntu_font_family
where-is-my-sddm-theme
]; ];