Compare commits

..

No commits in common. "698c7d7ee7d9a809e2c19073053e413a2b3d4a1c" and "37b79824a151abc91be025aa62c1604afa02162b" have entirely different histories.

5 changed files with 26 additions and 36 deletions

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": {

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;
@ -56,22 +55,16 @@
# 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;
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 = {
@ -100,14 +93,13 @@
]; ];
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 = {

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

View file

@ -1,5 +1,6 @@
# Default config for sway # Default config for sway
include ~/.config/sway/config.d/*
include /etc/sway/config.d/* include /etc/sway/config.d/*
# #
@ -65,7 +66,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'
@ -278,5 +279,3 @@ bindsym $mod+r mode "resize"
# blur on # blur on
# xwayland enable # xwayland enable
include ~/.config/sway/config.d/*

View file

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