tacocatgirl/nix-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: tacocatgirl:6ec267d3ff9744521fd4908583c8e5e0bd7d9a16
Branches Tags
tacocatgirl:main
tacocatgirl:radian
tacocatgirl:experimenting
..
compare: tacocatgirl:73f874f00014791109fd5c967e86c42e95ede843
Branches Tags
tacocatgirl:main
tacocatgirl:radian
tacocatgirl:experimenting

No commits in common. "6ec267d3ff9744521fd4908583c8e5e0bd7d9a16" and "73f874f00014791109fd5c967e86c42e95ede843" have entirely different histories.
6ec267d3ff ... 73f874f000

13 changed files with 123 additions and 78 deletions
Show stats Expand all files Collapse all files

30
flake.lock
View file

@ -74,11 +74,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1700076060, "lastModified": 1699826676,
"narHash": "sha256-fisxBv+v62yXFpkGCv+qdE8P4hsUJfd+iQoYGgNhMZ4=", "narHash": "sha256-L7816eSomVqG1lw07eTMBexHo6F5XxpSiSER+8GXGgU=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "2040444da9eb3a9b2438bf98c0568ce06ec4c1e4", "rev": "23fea46815371a8e1a0fa340be34d80624cd9bcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700087144, "lastModified": 1699783872,
"narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=", "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506", "rev": "280721186ab75a76537713ec310306f0eba3e407",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1699997707, "lastModified": 1699701045,
"narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=", "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
"owner": "NixOs", "owner": "NixOs",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9", "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699963925, "lastModified": 1699099776,
"narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bf744fe90419885eefced41b3e5ae442d732712d", "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +142,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1700166954, "lastModified": 1699907094,
"narHash": "sha256-f9+JUFDUzwmM+em8wqWgHvgTO4qCCYtKPUZ+nlVIirA=", "narHash": "sha256-9Brl2FJ+xIBRk3CNYsFWzx4pvRYUuM5fSps+GVswTzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "04d24fb0e6258af7bbe51b29308e670de81a7d2f", "rev": "9693ccc6b8835a960224c57cb1eb2faceabeda14",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -65,6 +65,7 @@
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules = [
./hosts/JWST/configuration.nix ./hosts/JWST/configuration.nix
./modules/sway.nix
nixos-hardware.nixosModules.dell-xps-15-9520 nixos-hardware.nixosModules.dell-xps-15-9520
nixos-hardware.nixosModules.common-gpu-nvidia-disable nixos-hardware.nixosModules.common-gpu-nvidia-disable
{ nixpkgs.overlays = overlays; } { nixpkgs.overlays = overlays; }

38
hosts/JWST/configuration.nix
View file

@ -30,7 +30,6 @@
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
nix.settings.trusted-users = [ "root" "tacocat" ];
nix.gc = { nix.gc = {
automatic = true; automatic = true;
@ -53,27 +52,19 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.geoclue2.enable = true; services.geoclue2.enable = true;
services.tlp.enable = true;
# Enable sound. # Enable sound.
sound.enable = true; sound.enable = true;
# hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
# services.pipewire.audio.enable = true; services.pipewire.audio.enable = true;
services.pipewire = {
enable = true;
audio.enable = true;
alsa.enable = true;
pulse.enable = true;
};
xdg.portal = { xdg.portal = {
enable = true; enable = true;
# wlr.enable = true; wlr.enable = true;
# extraPortals = with pkgs; [ extraPortals = with pkgs; [
# xdg-desktop-portal-wlr xdg-desktop-portal-wlr
# xdg-desktop-portal-gtk xdg-desktop-portal-gtk
# ]; ];
}; };
hardware.opengl = { hardware.opengl = {
@ -101,15 +92,14 @@
brightnessctl brightnessctl
]; ];
programs.sway.enable = true; # programs.sway.enable = true;
programs.sway.wrapperFeatures.gtk = true; # programs.sway.extraPackages = with pkgs; [
programs.sway.extraPackages = with pkgs; [ # swaylock
swaylock # swayidle
swayidle # brightnessctl
brightnessctl # ];
];
programs.waybar.enable = true; # programs.waybar.enable = true;
# programs.nm-applet.enable = true; # programs.nm-applet.enable = true;
environment = { environment = {

63
modules/sway.nix Normal file
View file

@ -0,0 +1,63 @@
{
config,
pkgs,
lib,
...
}: let
# bash script to let dbus know about important env variables and
# propagate them to relevent services run at the end of sway config
# see
# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
# note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts
# some user services to make sure they have the correct environment variables
dbus-sway-environment = pkgs.writeTextFile {
name = "dbus-sway-environment";
destination = "/bin/dbus-sway-environment";
executable = true;
text = ''
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
systemctl --user stop pipewire xdg-desktop-portal xdg-desktop-portal-wlr xdg-desktop-portal-gtk
systemctl --user start pipewire xdg-desktop-portal xdg-desktop-portal-wlr xdg-desktop-portal-gtk
'';
};
# currently, there is some friction between sway and gtk:
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
# the suggested way to set gtk settings is with gsettings
# for gsettings to work, we need to tell it where the schemas are
# using the XDG_DATA_DIR environment variable
# run at the end of sway config
configure-gtk = pkgs.writeTextFile {
name = "configure-gtk";
destination = "/bin/configure-gtk";
executable = true;
text = let
schema = pkgs.gsettings-desktop-schemas;
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
in ''
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
gnome_schema=org.gnome.desktop.interface
# gsettings set $gnome_schema gtk-theme 'Dracula'
'';
};
in {
# environment.systemPackages = [
# dbus-sway-environment
# configure-gtk
# ];
# enable sway window manager
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
extraPackages = with pkgs; [
dbus-sway-environment
configure-gtk
swaylock
swayidle
brightnessctl
];
};
# programs.waybar.enable = true;
}

5
users/tacocat/helix/default.nix
View file

@ -39,11 +39,6 @@
scrolloff = 5; scrolloff = 5;
middle-click-paste = false; middle-click-paste = false;
cursorline = true; cursorline = true;
cursor-shape = {
insert = "bar";
normal = "block";
select = "block";
};
auto-format = false; auto-format = false;
idle-timeout = 400; idle-timeout = 400;
color-modes = true; color-modes = true;

4
users/tacocat/helix/languages.nix
View file

@ -44,10 +44,10 @@
texlab = { texlab = {
command = "${pkgs.texlab}/bin/texlab"; command = "${pkgs.texlab}/bin/texlab";
config.texlab = { config.texlab = {
forwardSearch.executable = "${pkgs.zathura}"; forwardSearch.executable = lib.getExe pkgs.zathura;
forwardSearch.args = ["--synctex-forward" "%l:1:%f"]; forwardSearch.args = ["--synctex-forward" "%l:1:%f"];
build = { build = {
executable = "${pkgs.tectonic}/bin/tectonic"; executable = lib.getExe pkgs.tectonic;
onSave = true; onSave = true;
auxDirectory = "build"; auxDirectory = "build";
logDirectory = "build"; logDirectory = "build";

1
users/tacocat/home.nix
View file

@ -14,7 +14,6 @@
]; ];
packages = with pkgs; [ packages = with pkgs; [
rnote rnote
libreoffice
texlive.combined.scheme-medium texlive.combined.scheme-medium
libsixel libsixel
aspell aspell

2
users/tacocat/shell/default.nix
View file

@ -13,6 +13,7 @@
settings = { settings = {
add_newline = false; add_newline = false;
format = lib.concatStrings [ format = lib.concatStrings [
# "$line_break"
"$shlvl" "$shlvl"
"$directory" "$directory"
"$git_branch" "$git_branch"
@ -22,7 +23,6 @@
"$package" "$package"
"$nix_shell" "$nix_shell"
"$cmd_duration" "$cmd_duration"
"$line_break"
"$status" "$status"
"$character" "$character"
]; ];

16
users/tacocat/shell/fish.nix
View file

@ -1,22 +1,8 @@
{pkgs, ...}: { {...}: {
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = '' interactiveShellInit = ''
set -g fish_greeting set -g fish_greeting
fish_vi_key_bindings
set -g fish_cursor_insert line
''; '';
plugins = [
{
name = "z";
src = pkgs.fetchFromGitHub {
owner = "jethrokuan";
repo = "z";
rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
sha256 = "+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
};
}
];
}; };
} }

4
users/tacocat/wayland/default.nix
View file

@ -21,6 +21,10 @@
xdg.configFile."sway/background.jpg".source = ../background.jpg; xdg.configFile."sway/background.jpg".source = ../background.jpg;
# wayland.windowManager.sway = {
# enable = true;
# };
home.packages = with pkgs; [ home.packages = with pkgs; [
wl-clipboard wl-clipboard
# swaylock # swaylock

32
users/tacocat/wayland/sway/config
View file

@ -1,12 +1,13 @@
# Default config for sway # Default config for sway
include /etc/sway/config.d/*
# #
# Copy this to ~/.config/sway/config and edit it to your liking. # Copy this to ~/.config/sway/config and edit it to your liking.
# #
# Read `man 5 sway` for a complete reference. # Read `man 5 sway` for a complete reference.
exec dbus-sway-environment
# exec configure-gtk
### Variables ### Variables
# #
# Logo key. Use Mod1 for Alt. # Logo key. Use Mod1 for Alt.
@ -52,7 +53,6 @@ client.unfocused $unfocus $unfocus $unfocus $unfocus
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
output * bg ~/.config/sway/background.jpg fill output * bg ~/.config/sway/background.jpg fill
bar swaybar_command waybar
# #
# Example configuration: # Example configuration:
# #
@ -65,7 +65,7 @@ bar swaybar_command waybar
# Example configuration: # Example configuration:
# #
exec swayidle -w \ exec swayidle -w \
timeout 600 'swaylock -f -c 000000' \ timeout 300 'swaylock -f -c D3869B' \
timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
before-sleep 'swaylock -f -c 000000' before-sleep 'swaylock -f -c 000000'
@ -236,20 +236,23 @@ bindsym $mod+r mode "resize"
# #
# Status Bar: # Status Bar:
bar {
swaybar_command swaybar
# #
# Read `man 5 sway-bar` for more information about this section. # Read `man 5 sway-bar` for more information about this section.
# position top position top
# # When the status_command prints a new line to stdout, swaybar updates. # # When the status_command prints a new line to stdout, swaybar updates.
# # The default just shows the current date and time. # # The default just shows the current date and time.
# status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done
# colors { colors {
# statusline #ffffff statusline #ffffff
# background #323232 background #323232
# inactive_workspace #32323200 #32323200 #5c5c5c inactive_workspace #32323200 #32323200 #5c5c5c
# } }
# } }
# #
# Player # Player
@ -277,6 +280,9 @@ bindsym $mod+r mode "resize"
# SwayFX # SwayFX
# blur on # blur on
# xwayland enable xwayland enable
# include /etc/sway/config.d/*
include ~/.config/sway/config.d/* include ~/.config/sway/config.d/*

2
users/tacocat/wayland/sway/config.d/autostart
View file

@ -1,7 +1,7 @@
exec nm-applet exec nm-applet
exec systemctl --user restart wireplumber
exec gammastep-indicator exec gammastep-indicator
exec dunst exec dunst
# exec waybar
#exec swayidle -w \ #exec swayidle -w \
# timeout 600 'swaylock -f -c 14171d' \ # timeout 600 'swaylock -f -c 14171d' \
# before-sleep 'swaylock -f -c 14171d' # before-sleep 'swaylock -f -c 14171d'

3
users/tacocat/wayland/waybar/default.nix
View file

@ -2,6 +2,7 @@
programs.waybar = { programs.waybar = {
enable = true; enable = true;
style = ./style.css; style = ./style.css;
# systemd.enable = true;
settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "top";
@ -9,7 +10,7 @@
modules-left = [ modules-left = [
"sway/mode" "sway/mode"
"sway/workspaces" "sway/workspaces"
# "custom/arrow10" "custom/arrow10"
"sway/window" "sway/window"
]; ];
modules-right = [ modules-right = [