From afc59676a5fab7984021c902b849ece99f9c1cb9 Mon Sep 17 00:00:00 2001 From: martyTF Date: Sat, 24 Jan 2026 08:30:00 +0100 Subject: [PATCH] i once again ask for my nixos files to get onto my laptop --- flake.lock | 136 +++++++++--------- hosts/marty-pc/default.nix | 17 +++ modules/connectivity/internet/zen-browser.nix | 15 ++ modules/connectivity/social-media/default.nix | 3 + modules/defaults/desktop.nix | 3 + modules/desktop/hyprland.nix | 32 ++--- modules/desktop/walker.nix | 3 + modules/gaming/modding.nix | 2 +- modules/misc/default.nix | 1 + modules/misc/obsidian.nix | 20 +++ system/display-manager.nix | 3 - 11 files changed, 147 insertions(+), 88 deletions(-) create mode 100644 modules/misc/obsidian.nix diff --git a/flake.lock b/flake.lock index 524d8e5..d61d946 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1767024902, + "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1766069388, - "narHash": "sha256-PSFrMcVBKV+TiEgLyt2EPxOTlzmIPers+HFgh+cxkJs=", + "lastModified": 1769016387, + "narHash": "sha256-sDdvlidw6DEktudOLPWxj2OIsd5WVTAbfig4J3SJA7g=", "owner": "abenz1267", "repo": "elephant", - "rev": "8fa6fc252ebfa92c4175dd41827df9ab5c196003", + "rev": "03cbbf77d48fa462057353cd7e3f1a3a82f5b998", "type": "github" }, "original": { @@ -98,15 +98,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -114,11 +114,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1766387499, - "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", + "lastModified": 1769015285, + "narHash": "sha256-MlqzCJbckJsgwfkRs64H2xaX2Uxl4o6Z9XYfkYS1N/E=", "owner": "nix-community", "repo": "home-manager", - "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", + "rev": "ec0247a7a19f641595c24ac1ea4df6461d1cdb36", "type": "github" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1766946335, + "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "4af02a3925b454deb1c36603843da528b67ded6c", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766422408, - "narHash": "sha256-eWwTRcHCo2E1RwUKn4NcBrI9P8OCSEwBRhCp8/MJrbI=", + "lastModified": 1769011011, + "narHash": "sha256-lIF9wyXxf5QTv2D0HbI5n+l780S+WK6xxFgFZmoC7/M=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "abffe75088e2d776e14e5dbd726a835fa157df9a", + "rev": "22fc8136a21676472b232f9462318e16b1d16745", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1766258034, - "narHash": "sha256-0EoL8X+sYexDBusF9XyY2WoGKRqnARA+vfh/3uAi/j0=", + "lastModified": 1767723101, + "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "3e29d68d5a830c542643a52d4be726661eaa85e7", + "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -560,11 +560,11 @@ ] }, "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "lastModified": 1767473322, + "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "type": "github" }, "original": { @@ -581,11 +581,11 @@ "optnix": "optnix" }, "locked": { - "lastModified": 1766287443, - "narHash": "sha256-voUed/NmqwJuCjZDgRp9H8LLECyrEB2QAXhM/slePwU=", + "lastModified": 1769038775, + "narHash": "sha256-JkbtQg0fLTOg96IWbKUuylrMZ8NtICiQwCaoOGEJ0YQ=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "5a856cb469b7565e79cf12c1607fce29b6d5d371", + "rev": "6f07e6d616f1232b7d7d38f1df306e52342bd5b7", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -643,11 +643,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -659,11 +659,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764527385, - "narHash": "sha256-nA5ywiGKl76atrbdZ5Aucd8SjF/v8ew9b9QsC+MKL14=", + "lastModified": 1767151656, + "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23258e03aaa49b3a68597e3e50eb0cbce7e42e9d", + "rev": "f665af0cdb70ed27e1bd8f9fdfecaf451260fc55", "type": "github" }, "original": { @@ -691,11 +691,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -707,11 +707,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -728,11 +728,11 @@ ] }, "locked": { - "lastModified": 1768022677, - "narHash": "sha256-OhfqR3b/pESZOMwRpPBYbFJzKjVreok0+KEOFEUnVTk=", + "lastModified": 1769090704, + "narHash": "sha256-8jNDSoBIRMmg+YmKNabzua6a3kmZghsJeeWS5K2AdLU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "8636e5be1debfc99ef50f16003d5d122b5f30f3d", + "rev": "a3774c0687e5e3ab228933631f1a16e563d69f25", "type": "github" }, "original": { @@ -770,11 +770,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -866,11 +866,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1766324177, - "narHash": "sha256-7Y8Pqn12ovZ2nH1y+rxMbliUPhY4cu/iB0cwSNHTMZY=", + "lastModified": 1769016454, + "narHash": "sha256-FYfvyIed3v6IBNoc88jKAGfNy+FAO/AX3q5yhB1w5TM=", "owner": "abenz1267", "repo": "walker", - "rev": "fb6152710c450a4b81342db42857de4aea049716", + "rev": "e7d271735bd49152c4385b0a7ee59a941c35bc04", "type": "github" }, "original": { @@ -927,11 +927,11 @@ ] }, "locked": { - "lastModified": 1766377218, - "narHash": "sha256-y3g3OqPB0tmRjbHJNnJKivSQRtAJR+/9S1xbxBWEatg=", + "lastModified": 1767618227, + "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "2f61341b32dd69c07e147188e67e09ba2bb99c33", + "rev": "1586e49b3908b058e221f11d843eb46392dba17b", "type": "github" }, "original": { diff --git a/hosts/marty-pc/default.nix b/hosts/marty-pc/default.nix index 946c8b4..1a6ba06 100644 --- a/hosts/marty-pc/default.nix +++ b/hosts/marty-pc/default.nix @@ -57,4 +57,21 @@ }); ''; }; + environment.systemPackages = with pkgs; [ + qmk + qmk-udev-rules + qmk_hid + via + vial + ]; + + services.udev = { + packages = with pkgs; [ + qmk + qmk-udev-rules + qmk_hid + via + vial + ]; + }; } diff --git a/modules/connectivity/internet/zen-browser.nix b/modules/connectivity/internet/zen-browser.nix index c970712..57498b6 100644 --- a/modules/connectivity/internet/zen-browser.nix +++ b/modules/connectivity/internet/zen-browser.nix @@ -21,6 +21,21 @@ let "general.autoScroll" = true; "general.smoothScroll" = true; "middlemouse.contentLoadURL" = false; + "devtools.debugger.remote-enabled" = true; + "devtools.chrome.enabled" = true; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.ml.enable" = false; + "browser.ml.chat.enabled" = false; + "browser.ml.chat.menu" = false; + "browser.ml.chat.page" = false; + "browser.ml.chat.page.footerBadge" = false; + "browser.ml.chat.page.menuBadge" = false; + "browser.ml.linkPreview.enabled" = false; + "browser.ml.pageAssist.enabled" = false; + "browser.tabs.groups.smart.enabled" = false; + "browser.tabs.groups.smart.userEnabled" = false; + "extensions.ml.enabled" = false; + "browser.search.visualSearch.featureGate" = false; # ... }; diff --git a/modules/connectivity/social-media/default.nix b/modules/connectivity/social-media/default.nix index 471ff39..697b07c 100644 --- a/modules/connectivity/social-media/default.nix +++ b/modules/connectivity/social-media/default.nix @@ -9,4 +9,7 @@ imports = [ ./messaging ]; + home.packages = with pkgs; [ + fedistar + ]; } diff --git a/modules/defaults/desktop.nix b/modules/defaults/desktop.nix index 46a86e7..01df7da 100644 --- a/modules/defaults/desktop.nix +++ b/modules/defaults/desktop.nix @@ -50,5 +50,8 @@ video.enable = true; audio.enable = true; }; + misc = { + obsidian.enable = true; + }; }; } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index a8f4118..7867923 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -178,24 +178,24 @@ color = "rgba(1a1a1aee)"; }; }; - plugin = { - hyprexpo = { - columns = 2; - gap_size = 20; - bg_col = "rgb(e1e1e2)"; - workspace_method = "first 1"; - enable_gesture = true; - gesture_distance = 300; - gesture_positive = true; - gesture_negative = true; - }; - hyprtrails = { - color = "rgba(1a1a1aee)"; - }; - }; + # plugin = { + # hyprexpo = { + # columns = 2; + # gap_size = 20; + # bg_col = "rgb(e1e1e2)"; + # workspace_method = "first 1"; + # enable_gesture = true; + # gesture_distance = 300; + # gesture_positive = true; + # gesture_negative = true; + # }; + # hyprtrails = { + # color = "rgba(1a1a1aee)"; + # }; + # }; }; plugins = [ - inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails + # inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails # inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprexpo ]; diff --git a/modules/desktop/walker.nix b/modules/desktop/walker.nix index 8e2130e..94e141c 100644 --- a/modules/desktop/walker.nix +++ b/modules/desktop/walker.nix @@ -18,6 +18,9 @@ walker = { enable = true; runAsService = true; + config = { + theme = "noctalia"; + }; }; }; }; diff --git a/modules/gaming/modding.nix b/modules/gaming/modding.nix index 567ac60..c7620c1 100644 --- a/modules/gaming/modding.nix +++ b/modules/gaming/modding.nix @@ -14,7 +14,7 @@ config = lib.mkIf config.gaming.modding.enable { home.packages = with pkgs; [ - nexusmods-app-unfree + limo r2modman ]; }; diff --git a/modules/misc/default.nix b/modules/misc/default.nix index 5e37656..5b37a75 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -10,5 +10,6 @@ ./bitwarden.nix ./syncthing.nix ./secrets.nix + ./obsidian.nix ]; } diff --git a/modules/misc/obsidian.nix b/modules/misc/obsidian.nix new file mode 100644 index 0000000..c37883c --- /dev/null +++ b/modules/misc/obsidian.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + options = { + misc = { + obsidian.enable = lib.mkEnableOption "enable obsidian"; + }; + }; + + config = lib.mkIf config.misc.obsidian.enable { + home.packages = with pkgs; [ + obsidian + ]; + }; +} diff --git a/system/display-manager.nix b/system/display-manager.nix index fad8f15..50c1398 100644 --- a/system/display-manager.nix +++ b/system/display-manager.nix @@ -13,9 +13,6 @@ variant = ""; }; }; - displayManager.ly = { - enable = true; - }; power-profiles-daemon = { enable = true; };