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

Merge branch 'clean'

Browse source 
Merge branch that actually fixed sway
This commit is contained in:
Aria Nolan 2023-11-19 20:28:15 -05:00
parent 332bab9fb3 b1d93622d3
commit 6ec267d3ff
9 changed files with 60 additions and 29 deletions
Show stats Download patch file Download diff file 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": 1699826676, "lastModified": 1700076060,
"narHash": "sha256-L7816eSomVqG1lw07eTMBexHo6F5XxpSiSER+8GXGgU=", "narHash": "sha256-fisxBv+v62yXFpkGCv+qdE8P4hsUJfd+iQoYGgNhMZ4=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "23fea46815371a8e1a0fa340be34d80624cd9bcc", "rev": "2040444da9eb3a9b2438bf98c0568ce06ec4c1e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699783872, "lastModified": 1700087144,
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "280721186ab75a76537713ec310306f0eba3e407", "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1699701045, "lastModified": 1699997707,
"narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=", "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
"owner": "NixOs", "owner": "NixOs",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b689465d0c5d88e158e7d76094fca08cc0223aad", "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699099776, "lastModified": 1699963925,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +142,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1699907094, "lastModified": 1700166954,
"narHash": "sha256-9Brl2FJ+xIBRk3CNYsFWzx4pvRYUuM5fSps+GVswTzE=", "narHash": "sha256-f9+JUFDUzwmM+em8wqWgHvgTO4qCCYtKPUZ+nlVIirA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "9693ccc6b8835a960224c57cb1eb2faceabeda14", "rev": "04d24fb0e6258af7bbe51b29308e670de81a7d2f",
"type": "github" "type": "github"
}, },
"original": { "original": {

26
hosts/JWST/configuration.nix
View file

@ -30,6 +30,7 @@
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;
@ -52,19 +53,27 @@
# 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 = {
@ -93,13 +102,14 @@
]; ];
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 = {

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

@ -39,6 +39,11 @@
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;

1
users/tacocat/home.nix
View file

@ -14,6 +14,7 @@
]; ];
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,7 +13,6 @@
settings = { settings = {
add_newline = false; add_newline = false;
format = lib.concatStrings [ format = lib.concatStrings [
# "$line_break"
"$shlvl" "$shlvl"
"$directory" "$directory"
"$git_branch" "$git_branch"
@ -23,6 +22,7 @@
"$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,8 +1,22 @@
{...}: { {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=";
};
}
];
}; };
} }

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

@ -1,6 +1,5 @@
# Default config for sway # Default config for sway
include ~/.config/sway/config.d/*
include /etc/sway/config.d/* include /etc/sway/config.d/*
# #
@ -66,7 +65,7 @@ bar swaybar_command waybar
# Example configuration: # Example configuration:
# #
exec swayidle -w \ exec swayidle -w \
timeout 300 'swaylock -f -c D3869B' \ timeout 600 'swaylock -f -c 000000' \
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'
@ -279,3 +278,5 @@ bindsym $mod+r mode "resize"
# blur on # blur on
# xwayland enable # xwayland enable
include ~/.config/sway/config.d/*

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

@ -1,5 +1,5 @@
exec nm-applet exec nm-applet
# exec waybar exec systemctl --user restart wireplumber
exec gammastep-indicator exec gammastep-indicator
exec dunst exec dunst
#exec swayidle -w \ #exec swayidle -w \

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

@ -9,7 +9,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 = [