valnyx/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

niri not seeming good, switching to hyprland

Browse source
This commit is contained in:
valerie 2024-08-25 14:51:12 -04:00
parent 4cf5cd8fc5
commit 29529757b4
Signed by: valnyx
GPG key ID: CC10324DD962CB7E
10 changed files with 496 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

269
flake.lock
View file

@ -19,6 +19,120 @@
"type": "github"
}
},
"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": 1720809814,
"narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"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": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
},
"cachix": {
"inputs": {
"devenv": [
@ -351,6 +465,22 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_4": {
"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-parts": {
"inputs": {
"nixpkgs-lib": [
@ -564,6 +694,43 @@
"type": "github"
}
},
"flake-utils_7": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"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": {
"inputs": {
"nixpkgs": [
@ -636,6 +803,23 @@
"type": "github"
}
},
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -656,6 +840,27 @@
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715930644,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nh": {
"inputs": {
"nixpkgs": [
@ -875,6 +1080,22 @@
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1700612854,
@ -1114,7 +1335,38 @@
"niri": "niri",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_9",
"nixpkgs-unstable": "nixpkgs-unstable"
"nixpkgs-unstable": "nixpkgs-unstable",
"stylix": "stylix"
}
},
"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_4",
"flake-utils": "flake-utils_7",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_10",
"systems": "systems_8"
},
"locked": {
"lastModified": 1724444244,
"narHash": "sha256-fH1lyJvJjUhZ8xMlmiI18EZNzodDSe74rFuwlZDL0aQ=",
"owner": "danth",
"repo": "stylix",
"rev": "d042af478ce87e188139480922a3085218194106",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"type": "github"
}
},
"systems": {
@ -1222,6 +1474,21 @@
"type": "github"
}
},
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"umu": {
"inputs": {
"nixpkgs": [

147
flake.nix
View file

@ -1,88 +1,91 @@
{
description = "nixos system configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
description = "nixos system configuration";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nh = {
url = "github:viperML/nh";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-gaming = {
url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs";
};
nh = {
url = "github:viperML/nh";
inputs.nixpkgs.follows = "nixpkgs";
};
niri = {
url = "github:sodiboo/niri-flake";
};
nix-gaming = {
url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs";
};
ags.url = "github:Aylur/ags";
};
niri = {
url = "github:sodiboo/niri-flake";
};
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
home-manager,
flake-utils,
...
} @ inputs: {
nixosConfigurations.waves = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit (self) outputs;
inherit inputs flake-utils;
};
modules = [
inputs.disko.nixosModules.default
(import ./disko.nix {device="/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_with_Heatsink_1TB_S6WSNJ0T900943T";})
./waves.nix
];
};
ags.url = "github:Aylur/ags";
overlays = import ./overlays {inherit inputs;};
stylix.url = "github:danth/stylix";
};
homeConfigurations."dv@waves" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { system = "x86_64-linux"; };
extraSpecialArgs = {
inherit (self) outputs;
inherit inputs flake-utils;
};
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
home-manager,
flake-utils,
...
} @ inputs:
{
nixosConfigurations.waves = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit (self) outputs;
inherit inputs flake-utils;
};
modules = [
inputs.disko.nixosModules.default
(import ./disko.nix {device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_with_Heatsink_1TB_S6WSNJ0T900943T";})
./waves.nix
];
};
modules = [
inputs.niri.homeModules.niri
# inputs.niri.homeModules.config
./modules/home/dv.nix
];
};
} // flake-utils.lib.eachDefaultSystem(system: let
pkgs = nixpkgs.legacyPackages.${system};
inherit (self) outputs;
in {
packages = (import ./pkgs pkgs);
overlays = import ./overlays {inherit inputs;};
apps = {
"disko" = {
type = "app";
program = "${self.outputs.packages.${system}.disko}/bin/disko";
};
};
homeConfigurations."dv@waves" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {system = "x86_64-linux";};
extraSpecialArgs = {
inherit (self) outputs;
inherit inputs flake-utils;
};
formatter = pkgs.alejandra;
modules = [
inputs.niri.homeModules.niri
inputs.stylix.homeManagerModules.stylix
# inputs.niri.homeModules.config
./modules/home/dv.nix
];
};
}
// flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
inherit (self) outputs;
in {
packages = import ./pkgs pkgs;
apps = {
"disko" = {
type = "app";
program = "${self.outputs.packages.${system}.disko}/bin/disko";
};
};
});
formatter = pkgs.alejandra;
});
}

2
modules/home/dev/default.nix
View file

@ -9,7 +9,7 @@
unstable.bruno
unstable.xclip
unstable.just
unstable.nil
unstable.nixd
unstable.alejandra
unstable.zoxide
unstable.neovide

136
modules/home/dv.nix
View file

@ -1,21 +1,29 @@
{pkgs, lib, config, inputs, outputs, ...}: {
imports = [
./services.nix
./programs.nix
# development
./dev
# terminal
./term
# gui
./gui-core.nix
./ags.nix
./niri.nix
];
{
pkgs,
lib,
config,
inputs,
outputs,
...
}: {
imports = [
./services.nix
./programs.nix
./stylix.nix
# development
./dev
# terminal
./term
# gui
./gui-core.nix
./ags.nix
./niri.nix
];
nix = {
#package = pkgs.nix;
registry.nixpkgs.flake = inputs.nixpkgs;
gc.automatic = true;
nix = {
#package = pkgs.nix;
registry.nixpkgs.flake = inputs.nixpkgs;
gc.automatic = true;
settings = {
# Enable flakes and new 'nix' command
experimental-features = "nix-command flakes";
@ -24,53 +32,53 @@
# Workaround for https://github.com/NixOS/nix/issues/9574
#allowUnfree = true;
};
};
};
nixpkgs.config = {
allowUnfree = true;
cudaSupport = true;
};
nixpkgs.overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
inputs.niri.overlays.niri
];
home = {
file.".ssh/id_user.pub".text = builtins.readFile ../nixos/id_user.pub;
username = "dv";
homeDirectory = "/dv";
extraOutputsToInstall = ["doc" "devdoc"];
packages = [
inputs.nh.packages.x86_64-linux.default
pkgs.nom
pkgs.pinta
pkgs.vesktop
pkgs.signal-desktop
pkgs.blockbench
pkgs.blender
pkgs.prismlauncher
pkgs.steam
];
sessionVariables = {
NIX_AUTO_RUN = "1";
FLAKE = "/dv/nixos";
};
stateVersion = "24.11";
nixpkgs.config = {
allowUnfree = true;
cudaSupport = true;
};
nixpkgs.overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
inputs.niri.overlays.niri
];
home = {
file.".ssh/id_user.pub".text = builtins.readFile ../nixos/id_user.pub;
username = "dv";
homeDirectory = "/dv";
extraOutputsToInstall = ["doc" "devdoc"];
packages = [
inputs.nh.packages.x86_64-linux.default
pkgs.nom
pkgs.pinta
pkgs.vesktop
pkgs.signal-desktop
pkgs.blockbench
pkgs.blender
pkgs.prismlauncher
pkgs.steam
];
sessionVariables = {
NIX_AUTO_RUN = "1";
FLAKE = "/dv/nixos";
};
nix.package = lib.mkForce pkgs.unstable.nixVersions.latest;
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
manual = {
html.enable = false;
json.enable = false;
manpages.enable = false;
};
programs.home-manager.enable = true;
programs.git.enable = true;
#programs.nix-index.enable = true;
#programs.nix-index.symlinkToCacheHome = true;
#programs.nix-index-database.comma.enable = true;
systemd.user.startServices = "sd-switch";
stateVersion = "24.11";
};
nix.package = lib.mkForce pkgs.unstable.nixVersions.latest;
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
manual = {
html.enable = false;
json.enable = false;
manpages.enable = false;
};
programs.home-manager.enable = true;
programs.git.enable = true;
#programs.nix-index.enable = true;
#programs.nix-index.symlinkToCacheHome = true;
#programs.nix-index-database.comma.enable = true;
systemd.user.startServices = "sd-switch";
}

1
modules/home/gui-core.nix
View file

@ -1,6 +1,7 @@
{pkgs, ...}: {
home.packages = with pkgs; [
noto-fonts
julia-mono
noto-fonts-emoji
material-design-icons
cozette

4
modules/home/niri.nix
View file

@ -107,6 +107,10 @@
{
"Mod+T".action = spawn "wezterm";
"Mod+D".action = spawn "fuzzel";
"Mod+J".action = focus-window-or-workspace-down;
"Mod+K".action = focus-window-or-workspace-up;
"Mod+Ctrl+J".action = move-window-down-or-to-workspace-down;
"Mod+Ctrl+K".action = move-window-up-or-to-workspace-up;
}
];
};

20
modules/home/stylix.nix Normal file
View file

@ -0,0 +1,20 @@
{
pkgs,
inputs,
...
}: {
imports = [
inputs.niri.homeModules.stylix
];
stylix.targets.niri.enable = true;
stylix.image = ./wallhaven-expk3o.png;
stylix.polarity = "dark";
stylix.base16Scheme = builtins.readFile (pkgs.fetchFromGitHub {
owner = "camellia-theme";
repo = "camellia";
rev = "3b319bb337caccc311e60c3a8d357c4431b63680";
hash = "sha256-HNdGHJ8n81HpVK9gFiRLZBBh0sz4FIUUx/ykGyoxv0c=";
}
+ "/ports/base16/camelliaHopeDark.yml");
stylix.autoEnable = true;
}

80
modules/home/term/default.nix
View file

@ -1,12 +1,19 @@
{
config,
pkgs,
...
config,
pkgs,
...
}: let
pst = pkgs.writeShellScriptBin "pst" (builtins.readFile ./pst);
in {
programs = {
wezterm = {
xdg.configFile."wezterm/colors/camellia-hope-dark.toml".text = builtins.readFile (pkgs.fetchFromGitHub {
owner = "camellia-theme";
repo = "camellia";
rev = "3b319bb337caccc311e60c3a8d357c4431b63680";
hash = "sha256-HNdGHJ8n81HpVK9gFiRLZBBh0sz4FIUUx/ykGyoxv0c=";
}
+ "/ports/wezterm/colors/camelliaHopeDark.toml");
programs = {
wezterm = {
enable = true;
extraConfig = builtins.readFile ./wezterm.lua;
};
@ -39,18 +46,29 @@ wezterm = {
flavor.use = "tokyo-night";
opener = {
edit = [
{ run = ''nvim "$@"''; block = true; for = "unix";}
{
run = ''nvim "$@"'';
block = true;
for = "unix";
}
];
play = [
{ run = ''mpv "$@"''; orphan = true; for = "unix";}
{
run = ''mpv "$@"'';
orphan = true;
for = "unix";
}
];
open = [
{ run = ''xdg-open "$@"''; desc = "Open";}
{
run = ''xdg-open "$@"'';
desc = "Open";
}
];
};
};
};
tmux = {
tmux = {
enable = true;
mouse = true;
prefix = "C-Space";
@ -59,23 +77,23 @@ tmux = {
plugins = with pkgs.tmuxPlugins; [
vim-tmux-navigator
yank
# {
# plugin = tokyo-night-tmux;
# extraConfig = ''
## tokyo night tmux config
#set -g @tokyo-night-tmux_theme "night"
#set -g @tokyo-night-tmux_show_datetime 0
#set -g @tokyo-night-tmux_path_format relative
#set -g @tokyo-night-tmux_window_id_style digital
#set -g @tokyo-night-tmux_pane_id_style hide
#set -g @tokyo-night-tmux_show_git 0
#
## Undercurl fixes (tokyonight.nvim)
#set -g default-terminal "${TERM}"
#set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support
#set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux 3.0
# '';
# }
# {
# plugin = tokyo-night-tmux;
# extraConfig = ''
## tokyo night tmux config
#set -g @tokyo-night-tmux_theme "night"
#set -g @tokyo-night-tmux_show_datetime 0
#set -g @tokyo-night-tmux_path_format relative
#set -g @tokyo-night-tmux_window_id_style digital
#set -g @tokyo-night-tmux_pane_id_style hide
#set -g @tokyo-night-tmux_show_git 0
#
## Undercurl fixes (tokyonight.nvim)
#set -g default-terminal "${TERM}"
#set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support
#set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux 3.0
# '';
# }
];
extraConfig = ''
set-option -sa terminal-overrides ",xterm*:Tc"
@ -103,11 +121,13 @@ tmux = {
bind '_' split-window -v -c "#{pane_current_path}"
bind | split-window -h -c "#{pane_current_path}"
bind c new-window -c "#{pane_current_path}"
run '~/.tmux/plugins/tpm/tpm'
'';
};
};
xdg.configFile."lf/icons".source = ./lf-icons;
programs.bat.enable = true;
};
xdg.configFile."lf/icons".source = ./lf-icons;
programs.bat.enable = true;
programs.eza.enable = true;
programs.man.enable = true;
home.packages = with pkgs; [
@ -297,7 +317,7 @@ xdg.configFile."lf/icons".source = ./lf-icons;
lazygit = "gitui";
ps = "procs";
du = "dust";
df= "duf";
df = "duf";
cdr = "cd \$(git rev-parse --show-toplevel)";
l = "eza -al --no-time --group-directories-first";
ls = "eza -al --no-time --group-directories-first";

7
modules/home/term/wezterm.lua
View file

@ -2,7 +2,7 @@ local wezterm = require("wezterm")
local config = wezterm.config_builder()
config.color_scheme = "Tokyo Night Moon"
config.color_scheme = "camellia-hope-dark"
config.use_fancy_tab_bar = false
config.window_decorations = "RESIZE"
config.hide_tab_bar_if_only_one_tab = true
@ -11,9 +11,12 @@ config.hide_tab_bar_if_only_one_tab = true
-- weight = "Regular",
-- })
config.font = wezterm.font_with_fallback({
{ family = "Rec Mono Waves", weight = "Regular" },
-- { family = "Rec Mono Waves", weight = "Regular" },
{ family = "JuliaMono", weight = "Regular" },
-- "CozetteHiDpi",
"Symbols Nerd Font Mono",
})
config.font_size = 10
-- config.cell_width = 0.88
config.set_environment_variables = {

BIN
modules/home/wallhaven-expk3o.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 MiB