emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clean

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-02-07 18:15:39 -05:00
parent 2c58c6936d
commit e515a20d08
10 changed files with 91 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -910,7 +910,9 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks-nix": "git-hooks-nix", "git-hooks-nix": "git-hooks-nix",
"kitty-themes-src": "kitty-themes-src", "kitty-themes-src": "kitty-themes-src",
"nixpkgs": "nixpkgs_6", "nixpkgs": [
"nixpkgs"
],
"nixpkgs-lib": "nixpkgs-lib_2", "nixpkgs-lib": "nixpkgs-lib_2",
"systems": "systems_5" "systems": "systems_5"
}, },
@ -1099,21 +1101,6 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1729507178,
"narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1738680400,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
@ -1235,7 +1222,7 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-rice": "nix-rice", "nix-rice": "nix-rice",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"paperwm": "paperwm", "paperwm": "paperwm",
"shikane": "shikane", "shikane": "shikane",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

5
flake.nix
View file

@ -24,7 +24,10 @@
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
nix-rice = { url = "github:bertof/nix-rice"; }; nix-rice = {
url = "github:bertof/nix-rice";
inputs.nixpkgs.follows = "nixpkgs";
};
kmonad = { kmonad = {
url = "github:kmonad/kmonad?dir=nix"; url = "github:kmonad/kmonad?dir=nix";

30
homes/emenel/default.nix
View file

@ -5,11 +5,12 @@
allowUnfree = true; allowUnfree = true;
}; };
overlays = builtins.attrValues nix-config.overlays overlays = builtins.attrValues nix-config.overlays
++ [ inputs.emacs-overlay.overlays.default ++ [
inputs.audio.overlays.default inputs.emacs-overlay.overlays.default
inputs.niri.overlays.niri inputs.audio.overlays.default
inputs.shikane.overlays.default inputs.niri.overlays.niri
inputs.nix-rice.overlays.default ]; inputs.nix-rice.overlays.default
];
}; };
imports = with nix-config.homeModules; [ imports = with nix-config.homeModules; [
@ -22,7 +23,7 @@
email email
gnome gnome
niri niri
shikane # shikane
]; ];
home = { home = {
@ -86,17 +87,7 @@
libappimage libappimage
transmission_4-gtk transmission_4-gtk
guile guile
python311 python3
python311Packages.pip
python311Packages.mido
python311Packages.simpleeval
python311Packages.parsedatetime
python311Packages.pytz
python311Packages.pint
python311Packages.babel
python311Packages.requests
python311Packages.distutils-extra
python311Packages.distlib
ruff ruff
(sbcl.withPackages (ps: with ps; [ (sbcl.withPackages (ps: with ps; [
@ -106,7 +97,6 @@
serapeum serapeum
])) ]))
kdotool kdotool
ccl ccl
racket racket
@ -151,8 +141,6 @@
zathura zathura
gpu-viewer gpu-viewer
wl-mirror wl-mirror
soundconverter soundconverter
@ -301,7 +289,7 @@
pointerCursor = { pointerCursor = {
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
name = "Bibtata-Modern-Classic"; name = "Bibata-Modern-Classic";
size = 24; size = 24;
gtk.enable = true; gtk.enable = true;
x11.enable = true; x11.enable = true;

17
homes/emenel/dotfiles/dot_config/shikane/config.toml
View file

@ -50,6 +50,23 @@ exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""
adaptive_sync = true adaptive_sync = true
[[profile]]
name = "projector"
[[profile.output]]
enable = true
search = ["m=ViewSonic PJ", "s=0x01010101", "v=ViewSonic Corporation"]
mode = "1920x1200@59.95Hz"
position = "0,0"
scale = 1.0
transform = "normal"
adaptive_sync = false
[[profile.output]]
enable = true
search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
[[profile]] [[profile]]
name = "laptop-misc" name = "laptop-misc"
exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""] exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]

10
hosts/eddie/configuration.nix
View file

@ -19,8 +19,12 @@
allowUnfree = true; allowUnfree = true;
}; };
overlays = builtins.attrValues nix-config.overlays overlays = builtins.attrValues nix-config.overlays
++ [ inputs.niri.overlays.niri ++ [
inputs.nix-rice.overlays.default ]; inputs.niri.overlays.niri
inputs.emacs-overlay.overlays.default
inputs.audio.overlays.default
inputs.nix-rice.overlays.default
];
}; };
# environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}"; # environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
@ -275,6 +279,8 @@
vSync = true; vSync = true;
}; };
programs.labwc.enable = true;
programs.nh = { programs.nh = {
enable = true; enable = true;
clean = { clean = {

14
modules/home/niri.nix
View file

@ -64,6 +64,11 @@
variable-refresh-rate = true; variable-refresh-rate = true;
}; };
"HDMI-A-1" = {
background-color = "#000000";
scale = 1;
};
"PNP(BNQ) BenQ PD2725U N2N00414019" = { "PNP(BNQ) BenQ PD2725U N2N00414019" = {
mode = { mode = {
width = 3840; width = 3840;
@ -114,7 +119,7 @@
active.gradient = { active.gradient = {
from = "#d8bfffdd"; from = "#d8bfffdd";
to = "#BD93FF99"; to = "#BD93FF99";
angle = 0; angle = 180;
in' = "srgb-linear"; in' = "srgb-linear";
}; };
width = 2; width = 2;
@ -170,9 +175,6 @@
open-floating = true; } open-floating = true; }
]; ];
# TODO write scripts to manage lid/sleep states using the output from loginctl session
switch-events = with config.lib.niri.actions; { switch-events = with config.lib.niri.actions; {
lid-close.action = spawn "niri msg output eDP-1 off && shikanectl switch desk-clam"; lid-close.action = spawn "niri msg output eDP-1 off && shikanectl switch desk-clam";
lid-open.action = spawn "niri msg output eDP-1 on"; lid-open.action = spawn "niri msg output eDP-1 on";
@ -327,8 +329,8 @@
"Mod+Shift+Equal".action = set-window-height "+10%"; "Mod+Shift+Equal".action = set-window-height "+10%";
"Mod+Ctrl+X".action = toggle-window-floating; "Mod+Ctrl+X".action = toggle-window-floating;
"Mod+Alt+X".action = switch-focus-between-floating-and-tiling; "Mod+X".action = switch-focus-between-floating-and-tiling;
"Mod+X".action = focus-workspace "scratchpad"; "Mod+S".action = focus-workspace "scratchpad";
"Print".action = screenshot; "Print".action = screenshot;
"Ctrl+Print".action = screenshot-screen; "Ctrl+Print".action = screenshot-screen;

37
modules/home/shell-conf.nix
View file

@ -125,6 +125,43 @@
thefuck = { thefuck = {
enable = true; enable = true;
}; };
ghostty = {
enable = true;
enableFishIntegration = true;
installBatSyntax = true;
settings = {
command = "/home/emenel/.nix-profile/bin/fish --login --interactive";
theme = "Adventure";
font-family = "JetBrains Mono";
font-size = 12;
background = 111111;
selection-foreground = "ffffff";
selection-background = 444444;
bold-is-bright = true;
cursor-style = "bar";
adjust-cursor-thickness = 2;
resize-overlay = "never";
cursor-click-to-move = true;
clipboard-paste-protection = true;
keybind = [
"ctrl+t=new_tab"
"ctrl+w=close_surface"
"ctrl+enter=new_split:down"
"ctrl+shift+enter=new_split:right"
"ctrl+alt+enter=equalize_splits"
"ctrl+alt+z=toggle_split_zoom"
"ctrl+alt+left=previous_tab"
"ctrl+alt+right=next_tab"
"ctrl+alt+up=goto_split:left"
"ctrl+alt+down=goto_split:right"
"ctrl+backspace=text:\x1b\x7f"
];
};
};
# zellij = {
# enable = true;
# };
wezterm = { wezterm = {
enable = true; enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default; package = inputs.wezterm.packages.${pkgs.system}.default;

2
overlays/theme.nix → overlays/rice.nix
View file

@ -1,6 +1,6 @@
self: super: self: super:
with super.lib.nix-rice; with super.lib.nix-rice;
let theme = kitty-themes.getThemeByName "DimmedMonokai"; let theme = kitty-themes.getThemeByName "Molokai";
in { in {
rice = { rice = {
colorPalette = rec { colorPalette = rec {

4
packages/rbw-latest.nix
View file

@ -24,14 +24,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rbw-latest"; pname = "rbw-latest";
version = "1.13.1"; version = "1.13.2";
src = fetchzip { src = fetchzip {
url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
hash = "sha256-6T1pa+LzgJLaPbWJg7imZZ6KuGJ47YqpSKXxrv4E+1I="; hash = "sha256-6T1pa+LzgJLaPbWJg7imZZ6KuGJ47YqpSKXxrv4E+1I=";
}; };
cargoHash = "sha256-NGt60HJwHnP4vwQp8oHpmmTa72lHVDftFo6whu4V9JQ="; cargoHash = "sha256-swEKG7o59LulwwtdYfRc5x1Wki4dFdT0bMlG7ksbQ4E=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

2
packages/tal/j8.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://tal-software.com/downloads/plugins/TAL-J-8_64_linux.zip"; url = "https://tal-software.com/downloads/plugins/TAL-J-8_64_linux.zip";
sha256 = "sha256-gBzlkqBzWHv1QhbzzOb2uWy1eyvPQqyRQzXMKWIunCc="; sha256 = "sha256-L6idx2wmBAK6AG2NFt+H/+6yx9M67120mgneI/1nnn4=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [