diff --git a/assets/wallpapers/clouds.jpg b/assets/wallpapers/clouds.jpg new file mode 100755 index 0000000..b83940f Binary files /dev/null and b/assets/wallpapers/clouds.jpg differ diff --git a/assets/wallpapers/eva-tiles-rotated.png b/assets/wallpapers/eva-tiles-rotated.png new file mode 100644 index 0000000..4c7c9b2 Binary files /dev/null and b/assets/wallpapers/eva-tiles-rotated.png differ diff --git a/assets/wallpapers/eva-tiles.png b/assets/wallpapers/eva-tiles.png new file mode 100644 index 0000000..2da4bad Binary files /dev/null and b/assets/wallpapers/eva-tiles.png differ diff --git a/assets/wallpapers/everforest.webp b/assets/wallpapers/everforest.webp new file mode 100644 index 0000000..04e48e8 Binary files /dev/null and b/assets/wallpapers/everforest.webp differ diff --git a/assets/wallpapers/frutiger-aero-rotated.png b/assets/wallpapers/frutiger-aero-rotated.png new file mode 100644 index 0000000..bac9b5e Binary files /dev/null and b/assets/wallpapers/frutiger-aero-rotated.png differ diff --git a/assets/wallpapers/frutiger-aero.png b/assets/wallpapers/frutiger-aero.png new file mode 100755 index 0000000..3237bea Binary files /dev/null and b/assets/wallpapers/frutiger-aero.png differ diff --git a/assets/wallpapers/lonely-wreckage-rotated.png b/assets/wallpapers/lonely-wreckage-rotated.png new file mode 100644 index 0000000..818b248 Binary files /dev/null and b/assets/wallpapers/lonely-wreckage-rotated.png differ diff --git a/assets/wallpapers/lonely-wreckage.png b/assets/wallpapers/lonely-wreckage.png new file mode 100644 index 0000000..d0ec70b Binary files /dev/null and b/assets/wallpapers/lonely-wreckage.png differ diff --git a/dotfiles/takamaki/equibop/equicord-settings.json b/dotfiles/takamaki/equibop/equicord-settings.json index b6f0bc6..d1eff27 100755 --- a/dotfiles/takamaki/equibop/equicord-settings.json +++ b/dotfiles/takamaki/equibop/equicord-settings.json @@ -4,7 +4,7 @@ "authenticated": false, "settingsSync": false, "url": "https://cloud.equicord.org/", - "settingsSyncVersion": 1789605673754 + "settingsSyncVersion": 1791329541151 }, "enableOnlineThemes": true, "enabledThemeLinks": [ @@ -1250,5 +1250,6 @@ "logLimit": 50 }, "ignoreResetWarning": false, - "userCssVars": {} + "userCssVars": {}, + "nativeTitleBar": false } \ No newline at end of file diff --git a/dotfiles/takamaki/niri.kdl b/dotfiles/takamaki/niri.kdl index 42316ea..ec442d4 100644 --- a/dotfiles/takamaki/niri.kdl +++ b/dotfiles/takamaki/niri.kdl @@ -13,8 +13,8 @@ input { } } -output "DP-2" { - mode "2560x1440" +output "DP-1" { + mode "2560x1440@180" } output "HDMI-A-2" { @@ -23,11 +23,6 @@ output "HDMI-A-2" { position x=-1080 y=-250 } -output "HDMI-A-1" { - mode "1920x1080@60" - transform "270" - position x=-1080 y=-250 -} overview { zoom 0.67; } layout { gaps 16 @@ -83,29 +78,29 @@ binds { window-rule { geometry-corner-radius 4 } -window-rule { // Maximized on vertical monitor +window-rule { // On secondary monitor match at-startup=true app-id="^equibop$" - open-maximized-to-edges true - open-on-output "HDMI-A-1" + open-on-output "HDMI-A-2" } -window-rule { // Maximized on main monitor +window-rule { // On primary monitor match at-startup=true app-id="^steam$" title="^Steam$" + open-on-output "DP-1" +} +window-rule { // Maximized + match app-id="^steam$" title="^Steam$" + match app-id="^equibop$" + match app-id="^code$" open-maximized-to-edges true - open-on-output "DP-2" } window-rule { // Fullscreen on main monitor match app-id="^steam_app_\\d+$" open-fullscreen true - open-on-output "DP-2" -} -window-rule { // Maximized on any monitor - match app-id="^code$" - open-maximized-to-edges true + open-on-output "DP-1" } window-rule { match app-id="^kitty$" default-column-width { proportion 0.4; } - open-on-output "DP-2" + open-on-output "DP-1" } window-rule { match app-id="^org\\.prismlauncher\\.PrismLauncher$" diff --git a/dotfiles/takamaki/noctalia/settings.toml b/dotfiles/takamaki/noctalia/settings.toml index 7521be2..e291dfb 100644 --- a/dotfiles/takamaki/noctalia/settings.toml +++ b/dotfiles/takamaki/noctalia/settings.toml @@ -1,4 +1,4 @@ -config_version = 13 +config_version = 14 [backdrop] blur_intensity = 0.64999998547136784 @@ -30,14 +30,14 @@ order = [ "default" ] thickness = 44 widget_spacing = 18 - [bar.default.monitor.DP-2] + [bar.default.monitor.DP-1] capsule_group = [] center = [ "active_window" ] enabled = true end = [ "notifications", "tray", "clock" ] start = [ "workspaces", "media" ] - [bar.default.monitor.HDMI-A-1] + [bar.default.monitor.HDMI-A-2] center = [ "clock" ] enabled = true end = [ "bar", "mail", "notifications", "tray" ] @@ -45,7 +45,7 @@ order = [ "default" ] thickness = 40 [battery.device."/org/freedesktop/UPower/devices/battery_hidpp_battery_0"] -warning_threshold = 25 +warning_threshold = 10 [brightness] enable_ddcutil = true @@ -93,7 +93,7 @@ inactive_opacity = 0.89999997988343239 item_spacing = 0 magnification_scale = 1.1000000014901161 main_axis_padding = 8 -monitors = [ "DP-2" ] +monitors = [] pinned = [ "net.thunderbird.Thunderbird", "org.prismlauncher.PrismLauncher", @@ -139,6 +139,7 @@ tint_intensity = 0.0 enabled = false schema_version = 2 widget_order = [ + "lockscreen-login-box@DP-1", "lockscreen-login-box@winit", "lockscreen-login-box@HDMI-A-1", "lockscreen-login-box@DP-2", @@ -150,6 +151,33 @@ widget_order = [ major_interval = 4 visible = true + [lockscreen_widgets.widget."lockscreen-login-box@DP-1"] + box_height = 196.0 + box_width = 810.0 + cx = 1280.0 + cy = 1258.0 + output = "DP-1" + placement_height = 1440.0 + placement_width = 2560.0 + rotation = 0.0 + type = "login_box" + + [lockscreen_widgets.widget."lockscreen-login-box@DP-1".settings] + background_color = "surface_variant" + background_opacity = 0.88 + background_radius = 12.0 + center_password_text = false + input_opacity = 1.0 + input_radius = 6.0 + layout = "regular" + show_caps_lock = true + show_keyboard_layout = true + show_login_button = true + show_media = true + show_session_buttons = true + show_unlock_hint = true + show_weather = true + [lockscreen_widgets.widget."lockscreen-login-box@DP-2"] box_height = 196.0 box_width = 810.0 @@ -210,8 +238,8 @@ widget_order = [ cx = 960.0 cy = 898.0 output = "HDMI-A-2" - placement_height = 0.0 - placement_width = 0.0 + placement_height = 1920.0 + placement_width = 1080.0 rotation = 0.0 type = "login_box" @@ -297,6 +325,7 @@ popup_shadows = false control_center_placement = "floating" floating_offset = 6 launcher_position = "auto" + session_placement = "floating" session_position = "auto" shadow = true transparency_mode = "glass" @@ -353,7 +382,7 @@ directory = "/home/grey/Pictures/Wallpapers" path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p-rotated.png" [wallpaper.monitors.HDMI-A-2] - path = "/home/grey/Pictures/Wallpapers/2560x1440.png" + path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p-rotated.png" [[wallpaper.favorite]] palette_source = "wallpaper" diff --git a/flake.lock b/flake.lock index 28fb62b..5f4a5c4 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1789531373, - "narHash": "sha256-DxsYphGAbt4LXL7druVkwKPhDcudSSTcryqPXDCYHUY=", + "lastModified": 1791259366, + "narHash": "sha256-Zxes2DL+6i3S5WKVNOhM96wwFiGivLUam5+tqIp6Sdk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6d7da906a1c5d0a1104a97b1bdaaf1054339907d", + "rev": "509b29bbfd176bab4bb5ebe7b090eae97bde91ad", "type": "gitlab" }, "original": { @@ -111,11 +111,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1788450739, - "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1789482455, - "narHash": "sha256-pD3qVlQ4mUCFoTWrYtxecpSitQMsgJvJIN0FUIDZoEU=", + "lastModified": 1791306979, + "narHash": "sha256-KuLePuhwJM9NLt/gTLHzXaOoSZKGoB3m7NfXjiQ98HY=", "owner": "nix-community", "repo": "home-manager", - "rev": "efa3ccb4c3cc90d832eab232976379058fa75aa3", + "rev": "fae6e9e42c3b762ab47635cddcfaf6f52374a61b", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1789546076, - "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", + "lastModified": 1791260994, + "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", + "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789542786, - "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=", + "lastModified": 1791254437, + "narHash": "sha256-qMSsgG+9tIdx282dMqGuJAUK3t6F36clM6efd0rXfes=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a", + "rev": "b25309931cfda5f0b8805f462a29897eeae50168", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1788057806, - "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", + "lastModified": 1790477367, + "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", + "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1789605353, - "narHash": "sha256-TVad1fHKAhumO671Ez81Kuw+ddAbkuaomORz+LPYPL4=", + "lastModified": 1791325739, + "narHash": "sha256-mKDB9QHtY9riqOqB2c+2bwisPj8G0cvSnz/mbAD8TlI=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "3dd92fdc2c773be82c8feda1fd2a735a0780fcc4", + "rev": "d698f30c5905ded5b060e819c13e891ae6dc6296", "type": "github" }, "original": { @@ -350,11 +350,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1789291406, - "narHash": "sha256-lfZ7yAaTZMuAzOSLjJ7ivrKIFk0E11koWTVgkWSXwuE=", + "lastModified": 1791109926, + "narHash": "sha256-N4ZWEoceF9U+np24Pzi8OjJwqjoe36zHUR31pEhUKng=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "09eed5c95105aada9ffabd4c7eb6b345dc4ba66f", + "rev": "32d97b6b3c3401e5d0e474c82e764f8f9bf35b86", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1787771653, - "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=", + "lastModified": 1790880877, + "narHash": "sha256-j42XqSKOAtuqtfHiElyHre2YS/h3Y3q1DjFnKODN1/k=", "owner": "nix-community", "repo": "stylix", - "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784", + "rev": "7c065d1ed05381fceb2403b963c5ad150f32fe39", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1789584125, - "narHash": "sha256-C9BpLH4dNggam12nz/Fx/M0Vlbw8WcT/cpOc37DPQAA=", + "lastModified": 1791266850, + "narHash": "sha256-F/scdmE9Y03TfSQWrBHaJWTRTr3rRQBqvJSDgF48g1c=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a12d482485d877cc066516ea256b435b209a1a8c", + "rev": "d9e4e25d6ade5d541074045d332d887c044e11f5", "type": "github" }, "original": { diff --git a/modules/capabilities/graphics.nix b/modules/capabilities/graphics.nix index 1bc868a..8e53ef1 100644 --- a/modules/capabilities/graphics.nix +++ b/modules/capabilities/graphics.nix @@ -9,6 +9,7 @@ signal-desktop github-desktop kdePackages.filelight + seahorse ]; in { flake.nixosModules.graphics = { pkgs, config, lib, ... }: { diff --git a/modules/hosts/takamaki/takamaki.nix b/modules/hosts/takamaki/takamaki.nix index b68a761..7776e95 100644 --- a/modules/hosts/takamaki/takamaki.nix +++ b/modules/hosts/takamaki/takamaki.nix @@ -108,9 +108,9 @@ LOOP_COUNTER=0 if [ "$1" == "1" ]; then - DEVICE="/dev/i2c-10" + DEVICE="/dev/i2c-9" elif [ "$1" == "2" ]; then - DEVICE="/dev/i2c-6" + DEVICE="/dev/i2c-7" else DEVICE=$1 fi