diff --git a/flake.lock b/flake.lock index 2c4e517..3968408 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1766553851, - "narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=", + "lastModified": 1767556355, + "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", "owner": "nix-community", "repo": "home-manager", - "rev": "7eca7f7081036a7b740090994c9ec543927f89a7", + "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1766399428, - "narHash": "sha256-vS6LSOMDOB3s+L6tqw9IGujxnmUAZQnEG+Vi640LayI=", + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6c3a6141ec1b367c58ead3f7f846c772a25f4e5", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1766586030, - "narHash": "sha256-t3IUR5E4+g9ICSfkXJG1wPsEosJBQblMcaxqfWnpjRY=", + "lastModified": 1767502237, + "narHash": "sha256-rRrn9I4H692troUl5pBtE3Y5mG2msSMU/2ro7+ZQrFM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cf4840f1dece99a31571732cc535bbfea2f212ab", + "rev": "e3efa5e2b53982f985044062c98426ec75d6695b", "type": "github" }, "original": { diff --git a/hosts/piaf/hardware.nix b/hosts/piaf/hardware.nix index 3182a75..8b0c5b3 100644 --- a/hosts/piaf/hardware.nix +++ b/hosts/piaf/hardware.nix @@ -2,7 +2,7 @@ { # Kernel - boot.kernelPackages = pkgs.linuxPackages_6_17; + boot.kernelPackages = pkgs.linuxPackages_6_18; # Boot boot.loader.systemd-boot.enable = true; @@ -72,8 +72,9 @@ # services."nix-daemon".serviceConfig.MemoryMax = "20G"; # }; - # Disabling failing test + # Tweaking failing packages nixpkgs.overlays = [ (final: prev: { + dfu-programmer = prev.dfu-programmer.overrideAttrs (_: { env.NIX_CFLAGS_COMPILE = "-std=gnu17"; }); # upower = prev.upower.overrideAttrs (_: { doCheck = false; }); # gxml = prev.gxml.overrideAttrs (_: { doCheck = false; }); # # orc = prev.orc.overrideAttrs (_: { doCheck = false; }); diff --git a/hosts/triforce/default.nix b/hosts/triforce/default.nix index ab1a918..94a2dae 100644 --- a/hosts/triforce/default.nix +++ b/hosts/triforce/default.nix @@ -33,7 +33,7 @@ in { ]; networking.hostName = "lyes-iso"; - networking.wireless.enable = lib.mkForce false; + # networking.wireless.enable = lib.mkForce false; # services.displayManager.autoLogin.user = lib.mkForce "lyes"; } diff --git a/users/lyes/desktop/home/apps/ghostty.nix b/users/lyes/desktop/home/apps/ghostty.nix index 2347bfe..a68467d 100644 --- a/users/lyes/desktop/home/apps/ghostty.nix +++ b/users/lyes/desktop/home/apps/ghostty.nix @@ -17,10 +17,16 @@ link-url = true; link-previews = true; + shell-integration-features = [ + "sudo" + "ssh-env" + "ssh-terminfo" + ]; + # keybind = [ - # # "ctrl+digit_0=reset_font_size" - # "ctrl+shift+0=reset_font_size" - # "ctrl+shift+w=close_surface:this" + # ''ctrl+digit_0=reset_font_size'' + # ''ctrl+shift+0=reset_font_size'' + # ''ctrl+shift+w=close_surface:this'' # ]; # keybind = "ctrl+shift+w=close_surface:this"; }; diff --git a/users/lyes/desktop/home/desktops/sway.nix b/users/lyes/desktop/home/desktops/sway.nix index 704067f..ba7a6cf 100644 --- a/users/lyes/desktop/home/desktops/sway.nix +++ b/users/lyes/desktop/home/desktops/sway.nix @@ -683,9 +683,17 @@ in "pulseaudio#microphone" "group/audio" "group/brightness" + "idle_inhibitor" "battery" ]; + idle_inhibitor = { + format = "{icon}"; + format-icons = { + activated = "󰈈"; + deactivated = "󰈉"; + }; + }; "custom/notification" = { "tooltip" = true; "format" = "{icon}"; @@ -783,6 +791,8 @@ in "mpd" = { "format" = "󰏤"; "format-paused" = "󰐊"; + "format-stopped" = "󰓛"; + "format-disconnected" = "󰓛"; "interval" = 1; "on-click" = "${pkgs.mpc}/bin/mpc toggle"; "on-click-right" = "${pkgs.mpc}/bin/mpc next"; @@ -969,6 +979,7 @@ in #brightness:hover, #battery:hover, #mpd:hover, + #idle_inhibitor:hover, #custom-powermenu:hover { opacity: 0.5; } @@ -986,11 +997,20 @@ in #backlight, #battery, #mpd, + #idle_inhibitor, #custom-powermenu { color: @foreground; padding: 6px 0; } + #mpd { + border-bottom: 1px solid @foreground; + } + + #workspaces { + border-top: 1px solid @background; + } + #workspaces button { color: @foreground; padding: 6px 0; diff --git a/users/lyes/desktop/home/xdg.nix b/users/lyes/desktop/home/xdg.nix index 51662d4..735e8d9 100644 --- a/users/lyes/desktop/home/xdg.nix +++ b/users/lyes/desktop/home/xdg.nix @@ -19,62 +19,70 @@ cacheHome = "${config.home.homeDirectory}/.cache"; dataHome = "${config.home.homeDirectory}/.local/share"; stateHome = "${config.home.homeDirectory}/.local/state"; - }; - # Default apps - xdg.mimeApps = { - enable = true; - associations.added = { - "x-scheme-handler/sms" = "org.gnome.Shell.Extensions.GSConnect.desktop;"; - "x-scheme-handler/tel" = "org.gnome.Shell.Extensions.GSConnect.desktop;"; - }; - defaultApplications = { - "text/plain" = "org.gnome.TextEditor.desktop"; - "text/markdown" = "org.gnome.TextEditor.desktop"; - "text/json" = "org.gnome.TextEditor.desktop"; - "text/html" = "firefox.desktop"; - "text/xml" = "org.gnome.TextEditor.desktop"; - "image/avif" = "org.gnome.Loupe.desktop"; - "image/png" = "org.gnome.Loupe.desktop"; - "image/jpeg" = "org.gnome.Loupe.desktop"; - "image/svg+xml" = "org.gnome.Loupe.desktop"; - "image/gif" = "org.gnome.Loupe.desktop"; - "image/webp" = "org.gnome.Loupe.desktop"; - "audio/mpeg" = "mpv.desktop"; - "audio/aac" = "mpv.desktop"; - "audio/webm" = "mpv.desktop"; - "audio/ogg" = "mpv.desktop"; - "video/x-matroska" = "mpv.desktop"; - "video/mp4" = "mpv.desktop"; - "video/webm" = "mpv.desktop"; - "video/ogg" = "mpv.desktop"; - "application/pdf" = "org.gnome.Papers.desktop"; - "application/msword" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.ms-powerpoint" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.ms-excel" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.presentationml.presentation" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.oasis.opendocument.text" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.oasis.opendocument.presentation" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.oasis.opendocument.spreadsheet" = "onlyoffice-desktopeditors.desktop"; - "application/epub+zip" = "com.github.johnfactotum.Foliate.desktop"; - "application/ogg" = "mpv.desktop"; - "application/xml" = "org.gnome.TextEditor.desktop"; - "application/xhtml+xml" = "firefox.desktop"; - "application/x-extension-htm" = "firefox.desktop"; - "application/x-extension-html" = "firefox.desktop"; - "application/x-extension-shtml" = "firefox.desktop"; - "application/x-extension-xhtml" = "firefox.desktop"; - "application/x-extension-xht" = "firefox.desktop"; - "application/x-bittorrent" = "de.haeckerfelix.Fragments.desktop"; - "message/rfc822" = "thunderbird.desktop"; - "x-scheme-handler/mailto" = "thunderbird.desktop"; - "x-scheme-handler/mid" = "thunderbird.desktop"; - "x-scheme-handler/discord" = "vesktop.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; - "x-scheme-handler/chrome" = "firefox.desktop"; + # autostart = { + # enable = true; + # # readOnly = true; + # # entries = [ + # # "${pkgs.dosage}" + # # ]: + # }; + + # Default apps + mimeApps = { + enable = true; + associations.added = { + "x-scheme-handler/sms" = "org.gnome.Shell.Extensions.GSConnect.desktop;"; + "x-scheme-handler/tel" = "org.gnome.Shell.Extensions.GSConnect.desktop;"; + }; + defaultApplications = { + "text/plain" = "org.gnome.TextEditor.desktop"; + "text/markdown" = "org.gnome.TextEditor.desktop"; + "text/json" = "org.gnome.TextEditor.desktop"; + "text/html" = "firefox.desktop"; + "text/xml" = "org.gnome.TextEditor.desktop"; + "image/avif" = "org.gnome.Loupe.desktop"; + "image/png" = "org.gnome.Loupe.desktop"; + "image/jpeg" = "org.gnome.Loupe.desktop"; + "image/svg+xml" = "org.gnome.Loupe.desktop"; + "image/gif" = "org.gnome.Loupe.desktop"; + "image/webp" = "org.gnome.Loupe.desktop"; + "audio/mpeg" = "mpv.desktop"; + "audio/aac" = "mpv.desktop"; + "audio/webm" = "mpv.desktop"; + "audio/ogg" = "mpv.desktop"; + "video/x-matroska" = "mpv.desktop"; + "video/mp4" = "mpv.desktop"; + "video/webm" = "mpv.desktop"; + "video/ogg" = "mpv.desktop"; + "application/pdf" = "org.gnome.Papers.desktop"; + "application/msword" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.ms-powerpoint" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.ms-excel" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.openxmlformats-officedocument.presentationml.presentation" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.oasis.opendocument.text" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.oasis.opendocument.presentation" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.oasis.opendocument.spreadsheet" = "onlyoffice-desktopeditors.desktop"; + "application/epub+zip" = "com.github.johnfactotum.Foliate.desktop"; + "application/ogg" = "mpv.desktop"; + "application/xml" = "org.gnome.TextEditor.desktop"; + "application/xhtml+xml" = "firefox.desktop"; + "application/x-extension-htm" = "firefox.desktop"; + "application/x-extension-html" = "firefox.desktop"; + "application/x-extension-shtml" = "firefox.desktop"; + "application/x-extension-xhtml" = "firefox.desktop"; + "application/x-extension-xht" = "firefox.desktop"; + "application/x-bittorrent" = "de.haeckerfelix.Fragments.desktop"; + "message/rfc822" = "thunderbird.desktop"; + "x-scheme-handler/mailto" = "thunderbird.desktop"; + "x-scheme-handler/mid" = "thunderbird.desktop"; + "x-scheme-handler/discord" = "vesktop.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/chrome" = "firefox.desktop"; + }; }; }; } diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index 042b77d..bfe0cb2 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -30,7 +30,7 @@ in { bitwarden-desktop # Messaging - discord + # discord vesktop wasistlos # signal-desktop @@ -151,7 +151,7 @@ in { via # Proton - # protonvpn-gui + protonvpn-gui # Multimedia pipewire.dev