diff --git a/flake.lock b/flake.lock index e0843d6..c1f716c 100644 --- a/flake.lock +++ b/flake.lock @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1742179690, - "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=", + "lastModified": 1739502527, + "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4", + "rev": "06fcea9445b5a005b40469a69f57f2147398bc94", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1742174123, - "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1742413977, - "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", + "lastModified": 1740437053, + "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", + "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742388435, - "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1742406979, - "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1742222981, - "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=", + "lastModified": 1740754923, + "narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487", + "rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3", "type": "github" }, "original": { diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 9648de3..8ed0324 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -23,12 +23,11 @@ systemd.services.factorio-backup-save = { description = "Backup factorio saves"; script = '' - FILENAME="space-age-$(date --iso=seconds | tr ':' '_').zip" ${lib.getExe pkgs.rsync} \ -av \ --chown=lelgenio \ /var/lib/factorio/saves/default.zip \ - ~lelgenio/Documentos/GameSaves/factorio_saves/$FILENAME + ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip ''; serviceConfig.Type = "oneshot"; wantedBy = [ "multi-user.target" ]; diff --git a/user/firefox.nix b/user/firefox.nix index 7d8d65f..4b69ad2 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -127,7 +127,46 @@ in #sidebar-header { display: none !important; } '' else - ""; + '' + /* Element | chrome://browser/content/browser.xhtml */ + + #navigator-toolbox { + display: grid; + grid-template-columns: 1fr 50px; + overflow: hidden; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + #nav-bar { + flex: 1; + width: 100%; + grid-column: 1 / 3; + grid-row: 1; + z-index: 0; + padding-right: 29px !important; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + .toolbar-items { + display: none; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + #TabsToolbar { + max-width: 50px; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + #titlebar { + max-width: 50px; + grid-area: 1 / 2; + z-index: 10; + } + ''; }; }; }; diff --git a/user/gnome.nix b/user/gnome.nix index 776f095..74951c7 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -35,7 +35,6 @@ lib.mkIf (config.my.desktop == "gnome") { amberol pitivi keepassxc - menulibre libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum diff --git a/user/home-manager.nix b/user/home-manager.nix deleted file mode 100644 index 9c8452a..0000000 --- a/user/home-manager.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, lib, ... }: -{ - programs.home-manager.enable = true; - - systemd.user.services.home-manager-expire = { - Unit = { - Description = "Remove old home-manager generations"; - }; - Service = { - Type = "oneshot"; - ExecStart = pkgs.writeShellScript "home-manager-expire" '' - ${lib.getExe pkgs.home-manager} expire-generations 7d - ''; - }; - }; - systemd.user.timers.home-manager-expire = { - Unit = { - Description = "Remove old home-manager generations"; - }; - Timer = { - OnCalendar = "daily"; - Unit = "home-manager-expire.service"; - }; - Install = { - WantedBy = [ "timers.target" ]; - }; - }; -} diff --git a/user/home.nix b/user/home.nix index 31e3871..c384c60 100644 --- a/user/home.nix +++ b/user/home.nix @@ -9,7 +9,6 @@ { imports = [ ./dummy.nix - ./home-manager.nix ./waybar ./helix.nix ./kakoune @@ -45,7 +44,6 @@ inputs.nix-index-database.hmModules.nix-index ../settings ./powerplay-led-idle.nix - ./rm-target.nix ]; my = import ./variables.nix // { @@ -59,6 +57,8 @@ home.username = "lelgenio"; home.homeDirectory = "/home/lelgenio"; + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; home.packages = with pkgs; [ terminal @@ -169,6 +169,30 @@ exec nicotine ''; + systemd.user.services.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "rm-target" '' + sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- + ''; + }; + }; + systemd.user.timers.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Timer = { + OnCalendar = "weekly"; + Unit = "rm-target.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; + # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/user/rm-target.nix b/user/rm-target.nix deleted file mode 100644 index 93c6058..0000000 --- a/user/rm-target.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, lib, ... }: -{ - systemd.user.services.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Service = { - Type = "oneshot"; - ExecStart = pkgs.writeShellScript "rm-target" '' - sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- - ''; - }; - }; - systemd.user.timers.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Timer = { - OnCalendar = "weekly"; - Unit = "rm-target.service"; - }; - Install = { - WantedBy = [ "timers.target" ]; - }; - }; -} diff --git a/user/sway/default.nix b/user/sway/default.nix index 046ae07..04193aa 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -20,7 +20,6 @@ in ./swayidle.nix ./swaylock.nix ./theme.nix - ./gammastep.nix ]; options.my.sway.enable = lib.mkEnableOption { }; @@ -33,7 +32,6 @@ in my.mpd.enable = true; my.zathura.enable = true; my.waybar.enable = true; - my.gammastep.enable = true; wayland.windowManager.sway = { enable = true; @@ -117,6 +115,10 @@ in exec_always systemctl --user restart waybar.service ''; }; + services.gammastep = { + enable = true; + provider = "geoclue2"; + }; services.kdeconnect = { enable = true; diff --git a/user/sway/gammastep.nix b/user/sway/gammastep.nix deleted file mode 100644 index a5b6917..0000000 --- a/user/sway/gammastep.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.my.gammastep; -in -{ - options.my.gammastep.enable = lib.mkEnableOption { }; - - config = lib.mkIf cfg.enable { - services.gammastep = { - enable = true; - dawnTime = "6:00-7:45"; - duskTime = "18:35-20:15"; - temperature = { - day = 6500; - night = 4500; - }; - }; - }; -}