diff --git a/flake.lock b/flake.lock index 294013c..dda230d 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1702538064, - "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=", + "lastModified": 1703178811, + "narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af", + "rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1702576940, - "narHash": "sha256-oZAcNIJ9T49N9V+8HDRqPpSMp4R2+S+CO6iomsDYwU0=", + "lastModified": 1703245058, + "narHash": "sha256-TPuiNxl/KTyCoqFIMfNtX33Gtb46DOPrP9EQ13Zn6qI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f7cde9c92cb9e7c908f18ecf10ebdb366d0832b5", + "rev": "7cec618fe47e457fe66ef772da00ef07665a8607", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1702559747, - "narHash": "sha256-d6AmQp3M00WMPJquNfGVzIol5iojD1pi9slek+4N9VY=", + "lastModified": 1703004037, + "narHash": "sha256-ceYPl/ML0kQBCUaOw0gG2TxHHEl4k9xivFpsdlKidIQ=", "owner": "danth", "repo": "stylix", - "rev": "41d218597590a89324a4b7c50cf0bf088a7214ba", + "rev": "d14ac4912a9ab02f8b49b761e9e4b9ae836171af", "type": "github" }, "original": { diff --git a/global/system.nix b/global/system.nix index a2f57d2..84b7159 100644 --- a/global/system.nix +++ b/global/system.nix @@ -11,6 +11,11 @@ user: { config, pkgs, lib, ... }: experimental-features = [ "nix-command" "flakes" ]; }; + nixpkgs.config.permittedInsecurePackages = [ + "electron-25.9.0" + ]; + + nix.settings.trusted-users = [ "root" user ]; boot.loader.systemd-boot.enable = true; diff --git a/hardware/displays.nix b/hardware/displays.nix index b81e8a7..553165f 100644 --- a/hardware/displays.nix +++ b/hardware/displays.nix @@ -19,7 +19,7 @@ x = 1920; y = 0; }; - wallpaper = "/home/tristan/Pictures/backgrounds/nier.jpg"; + wallpaper = "/home/tristan/Pictures/backgrounds/wallhaven-qzlyzd.jpg"; rotation = 1; } { @@ -29,7 +29,7 @@ x = 0; y = 1080; }; - wallpaper = "/home/tristan/Pictures/backgrounds/nix-wallpaper-watersplash.png"; + wallpaper = "/home/tristan/Pictures/backgrounds/nix-soft.png"; } ]; }; diff --git a/hardware/work.nix b/hardware/work.nix index 7c30bbc..f71715b 100644 --- a/hardware/work.nix +++ b/hardware/work.nix @@ -91,6 +91,10 @@ system.stateVersion = "22.11"; # do not change home-manager.users.${user}.imports = [{ home.stateVersion = "22.05"; + + programs.waybar.settings.mainBar."hyprland/workspaces".persistent_workspaces = { + eDP-1 = 5; + }; }]; } diff --git a/lib/modules/laptop.nix b/lib/modules/laptop.nix index 2e3448f..b594229 100644 --- a/lib/modules/laptop.nix +++ b/lib/modules/laptop.nix @@ -28,14 +28,14 @@ in gaps_out = 10; border_size = 3; }; - }; - bind = [ - "SUPER_SHIFT, Q, killactive," - ]; - "device:at-translated-set-2-keyboard" = { - kb_variant = "dvorak,"; - kb_layout = "gb,gb"; - kb_options = "grp:alt_shift_toggle,caps:escape"; + bind = [ + "SUPER_SHIFT, Q, killactive," + ]; + "device:at-translated-set-2-keyboard" = { + kb_variant = "dvorak,"; + kb_layout = "gb,gb"; + kb_options = "grp:alt_shift_toggle,caps:escape"; + }; }; }; }]; diff --git a/lib/modules/wayland.nix b/lib/modules/wayland.nix index 8ddbc40..7923836 100644 --- a/lib/modules/wayland.nix +++ b/lib/modules/wayland.nix @@ -128,7 +128,7 @@ in resize_on_border = true; layout = "master"; # "col.active_border" = "rgb(FFFF00) rgb(00FFFF) rgb(FF00FF)"; - border_size = 5; + border_size = lib.mkDefault 5; }; master = { mfact = 0.7; @@ -220,10 +220,11 @@ in }; mpris = { format = "{player_icon} {artist} - {title}"; - format-paused = "{status_icon} {artist} - {title}"; + format-paused = "{status_icon} {player_icon} {artist} - {title}"; player-icons = { default = "▢️"; mpd = "🎡"; + kdeconnect = "☎️"; }; status-icons = { paused = "⏸️"; @@ -232,6 +233,7 @@ in battery = { format = "{icon} {capacity}%"; format-icons = [ "🀏" "πŸͺ«" "πŸ”‹" "πŸ”‹" ]; + format-charging = "πŸ”Œ {capacity}%"; states = { warning = 30; critical = 15; @@ -244,7 +246,6 @@ in target = "graphical-session.target"; }; style = '' - * { min-height: 0; } @@ -279,7 +280,6 @@ in #tray { min-width: 5rem; } - ''; }; diff --git a/lib/modules/work.nix b/lib/modules/work.nix index 4ca9802..946b8c8 100644 --- a/lib/modules/work.nix +++ b/lib/modules/work.nix @@ -76,6 +76,7 @@ with lib; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ # nonfree vscode required for dev containers "vscode" + "steam-run" ]; networking = {