diff --git a/common/syncthing.nix b/common/syncthing.nix index c44cfc0..e4150e6 100644 --- a/common/syncthing.nix +++ b/common/syncthing.nix @@ -8,11 +8,13 @@ enable = true; user = "xqtc"; dataDir = "/home/xqtc/syncthing"; + overrideDevices = false; + overrideFolders = false; configDir = "${config.services.syncthing.dataDir}/.config/syncthing"; settings = { gui = { - user = "xqtc"; - # insecureSkipHostcheck = true; + user = "xqtc"; + # insecureSkipHostcheck = true; }; }; }; diff --git a/flake.lock b/flake.lock index c55c464..3bb423e 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1712989815, - "narHash": "sha256-RWP/TMdNnDfOnhK3CMDxezX9L+bALjqvnZXY16EvtA0=", + "lastModified": 1713167493, + "narHash": "sha256-Atjqvb9WOUyLzEgAVEXzBzPgymf2wT2K4i0XBdatbN0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "612713b8c55be97af5b4ff75ab5f427fde25328c", + "rev": "26277125de089543b890b70334211c6e1405db30", "type": "gitlab" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1713019815, - "narHash": "sha256-jzTo97VeKMNfnKw3xU+uiU5C7wtnLudsbwl/nwPLC7s=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8fdf329526f06886b53b94ddf433848a0d142984", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1712989663, + "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1713032949, - "narHash": "sha256-WZR0/LpLkSsajw9uFwUCEWBA9QtWWRRBNScnvwjJHCM=", + "lastModified": 1713176148, + "narHash": "sha256-4tvZfC2iv7McdRjHvuAoZqmYDsUruTnU1EM2/Rt2OHU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44f5a5f39c795cf7a2281529e732b0dcd9427140", + "rev": "20a3a2181494145baed7ad006727f3e15bc12f15", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713008785, - "narHash": "sha256-fblaj6/83OQYrD1UHBjLapxjGQaC4edouX4g2X8CVhk=", + "lastModified": 1713167695, + "narHash": "sha256-P+X1SeTYzkZI9VXsuTNkHjHmY77n1lXsjOb3Xs7eMsQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "21c233919d747d3375e3a173b65f7f26ccf01256", + "rev": "99068dab4b6d6dc55fb50cfaf807b156115e8d89", "type": "github" }, "original": { diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix index fd2a90c..22ad608 100644 --- a/home/modules/firefox.nix +++ b/home/modules/firefox.nix @@ -21,7 +21,7 @@ with inputs; { leechblock-ng darkreader stylus - violentmonkey + violentmonkey vimium-c noscript ]; @@ -83,6 +83,22 @@ with inputs; { definedAliases = ["@no"]; }; + "Nix Dev" = { + urls = [ + { + template = "https://nix.dev/search.html"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = ["@nd"]; + }; + "NixOS Wiki" = { urls = [ { diff --git a/home/modules/gtk.nix b/home/modules/gtk.nix index ae71e09..39070fc 100644 --- a/home/modules/gtk.nix +++ b/home/modules/gtk.nix @@ -16,8 +16,8 @@ enabled-extensions = [ "user-theme@gnome-shell-extensions.gcampax.github.com" "trayIconsReloaded@selfmade.pl" - "burn-my-windows@schneegans.github.com" - "desktop-cube@schneegans.github.com" + "burn-my-windows@schneegans.github.com" + "desktop-cube@schneegans.github.com" "Vitals@CoreCoding.com" "dash-to-panel@jderose9.github.com" # "blur-my-shell@aunetx" @@ -64,12 +64,11 @@ gnomeExtensions.desktop-cube catppuccin-cursors.mochaPink ]; -# home.pointerCursor = { -# gtk.enable = true; -# x11.enable = true; -# name = "Catppuccin-Mocha-Pink-Cursors"; -# package = pkgs.catppuccin-cursors.mochaPink; -# # size = 24; -# }; - + # home.pointerCursor = { + # gtk.enable = true; + # x11.enable = true; + # name = "Catppuccin-Mocha-Pink-Cursors"; + # package = pkgs.catppuccin-cursors.mochaPink; + # # size = 24; + # }; } diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 9def23b..f85a7d2 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -10,6 +10,7 @@ pkgs.steam pkgs.protonup-qt pkgs.via + pkgs.telegram-desktop # pkgs.spotify ] else []; @@ -19,18 +20,22 @@ in { home.packages = [ pkgs.neofetch - pkgs.uwufetch + # pkgs.uwufetch maxfetch pkgs.btop pkgs.iftop pkgs.ranger + pkgs.openvpn + pkgs.moodle-dl pkgs.anki pkgs.obsidian + pkgs.syncthingtray + pkgs.brightnessctl pkgs.pavucontrol @@ -50,7 +55,6 @@ in { pkgs.signal-desktop pkgs.vesktop - pkgs.telegram-desktop pkgs.element-desktop pkgs.qbittorrent @@ -62,6 +66,7 @@ in { pkgs.neovide pkgs.xournalpp + pkgs.zathura pkgs.ripgrep diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix index 8f81ba2..afbd30e 100644 --- a/hosts/aarch64-linux/alastor/default.nix +++ b/hosts/aarch64-linux/alastor/default.nix @@ -147,8 +147,8 @@ services.openssh.enable = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [22]; - # networking.firewall.allowedUDPPorts = [ ... ]; + networking.firewall.allowedTCPPorts = [22 2234]; + networking.firewall.allowedUDPPorts = [2234]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 35dac51..5dd8ef7 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -21,28 +21,28 @@ with lib; { enable = true; email = "xqtc@tutanota.com"; configFile = pkgs.writeText "Caddyfile" '' - heroin.trade { - root * /var/www/website/build/ - file_server - } - syncthing.heroin.trade { - reverse_proxy http://localhost:8384 { - header_up Some-Header "localhost" - } - } - demos.heroin.trade { - root * /var/www/demos/ - file_server browse - } - jellyfin.heroin.trade { - reverse_proxy http://127.0.0.1:8096 - } - calibre.heroin.trade { - reverse_proxy http://localhost:3000 - } - grafana.heroin.trade { - reverse_proxy http://127.0.0.1:2342 + heroin.trade { + root * /var/www/website/build/ + file_server + } + syncthing.heroin.trade { + reverse_proxy http://localhost:8384 { + header_up Some-Header "localhost" } + } + demos.heroin.trade { + root * /var/www/demos/ + file_server browse + } + jellyfin.heroin.trade { + reverse_proxy http://127.0.0.1:8096 + } + calibre.heroin.trade { + reverse_proxy http://localhost:3000 + } + grafana.heroin.trade { + reverse_proxy http://127.0.0.1:2342 + } ''; };