diff --git a/configurations/host/flamaster/home/materus/default.nix b/configurations/host/flamaster/home/materus/default.nix index b3055a3..3b84d00 100644 --- a/configurations/host/flamaster/home/materus/default.nix +++ b/configurations/host/flamaster/home/materus/default.nix @@ -10,11 +10,12 @@ enableTerminal = lib.mkDefault true; enableTerminalExtra = lib.mkDefault true; enableNixDevel = lib.mkDefault true; - + + bash.enable = true; zsh.enable = true; }; - + home.packages = [ pkgs.papirus-icon-theme (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; }) diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index d5f4166..5bc7b94 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/configurations/host/materusPC/home/materus/default.nix @@ -86,6 +86,7 @@ materusArg.pkgs.ffmpeg6-amf-full (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; }) pkgs.git-crypt + pkgs.obsidian ]; programs.obs-studio = { diff --git a/configurations/host/materusPC/network.nix b/configurations/host/materusPC/network.nix index a90f42a..e030a07 100644 --- a/configurations/host/materusPC/network.nix +++ b/configurations/host/materusPC/network.nix @@ -12,11 +12,11 @@ networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 9943 9944 ]; networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 9943 9944 ]; - #Fix warning - networking.networkmanager.extraConfig = lib.mkDefault '' - [connectivity] - uri=http://nmcheck.gnome.org/check_network_status.txt - ''; + networking.networkmanager.settings = { + connectivity = { + uri = "http://nmcheck.gnome.org/check_network_status.txt"; + }; + }; networking.networkmanager.ensureProfiles.environmentFiles = [ config.sops.templates."networkmanager.env".path diff --git a/configurations/profile/common/packages/default.nix b/configurations/profile/common/packages/default.nix index b2964f1..91a09c6 100644 --- a/configurations/profile/common/packages/default.nix +++ b/configurations/profile/common/packages/default.nix @@ -34,7 +34,6 @@ with materusArg.pkgs.lib; tdesktop mpv ani-cli - obsidian nextcloud-client spotify thunderbird diff --git a/configurations/profile/os/nix.nix b/configurations/profile/os/nix.nix index 3c0bd43..03e27ee 100644 --- a/configurations/profile/os/nix.nix +++ b/configurations/profile/os/nix.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, materusArg, ... }: +{ config, pkgs, lib, materusArg, materusCfg, ... }: let cfg = config.materus.profile.nix; in @@ -7,7 +7,7 @@ in config.nix = lib.mkIf cfg.enable { settings = { - experimental-features = [ "nix-command" "flakes" "repl-flake" "no-url-literals" ]; + experimental-features = lib.mkMerge [[ "nix-command" "flakes" "no-url-literals" ] (lib.mkIf (materusCfg.stable) ["repl-flake"])]; auto-optimise-store = true; trusted-users = [ "root" "@wheel" ]; diff --git a/flake.lock b/flake.lock index d16fdac..fa8445d 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713517520, - "narHash": "sha256-t59lpRo7EulX9J0/bc5/8cUEo7hl6z9YOYukzg54cyU=", + "lastModified": 1714237490, + "narHash": "sha256-5cdV7tlOHaQ8M808CRk5TJLBaqi2ANLcCq9Ar5JQG5s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a8692d4e570e93061d2bbe10af4a1590afe82e15", + "rev": "aee4d3daa7cb71f903492103d1ea522efcf6f740", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713517520, - "narHash": "sha256-t59lpRo7EulX9J0/bc5/8cUEo7hl6z9YOYukzg54cyU=", + "lastModified": 1714237490, + "narHash": "sha256-5cdV7tlOHaQ8M808CRk5TJLBaqi2ANLcCq9Ar5JQG5s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a8692d4e570e93061d2bbe10af4a1590afe82e15", + "rev": "aee4d3daa7cb71f903492103d1ea522efcf6f740", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "lastModified": 1714043624, + "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", "type": "github" }, "original": { @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1713539802, - "narHash": "sha256-aub7mcsDv5J6PcYNxcLUCIaNGNlInPCAYYoCA1x76oY=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f305c363ecd7c6505f03fc7baba15505f3aa630", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -378,10 +378,10 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712317700, - "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=", - "path": "/nix/store/6kq2krynx50y7ws18xhpljn5rjzk37ps-source", - "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f", + "lastModified": 1713539802, + "narHash": "sha256-aub7mcsDv5J6PcYNxcLUCIaNGNlInPCAYYoCA1x76oY=", + "path": "/nix/store/5b32s5q4vnnialz12l22cb4vy0rzmv9k-source", + "rev": "1f305c363ecd7c6505f03fc7baba15505f3aa630", "type": "path" }, "original": { @@ -445,11 +445,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713521961, - "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1713521961, - "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1713434076, - "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", + "lastModified": 1713638189, + "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", + "rev": "74574c38577914733b4f7a775dd77d24245081dd", "type": "github" }, "original": { @@ -525,11 +525,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { @@ -541,11 +541,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1713434076, - "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", + "lastModified": 1713638189, + "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", + "rev": "74574c38577914733b4f7a775dd77d24245081dd", "type": "github" }, "original": { @@ -557,11 +557,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { @@ -573,11 +573,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nur_2": { "locked": { - "lastModified": 1713540396, - "narHash": "sha256-mc9hP0I2K2I23fx0py4bp6k28liXgBRilVQRc5hb3LU=", + "lastModified": 1714250691, + "narHash": "sha256-OIs8D5aNGgQlBbOXDSVw8hK+c1iyPrpAwIgs9/k+dN4=", "owner": "nix-community", "repo": "NUR", - "rev": "e16ee8a64f1ab6bfbd54f24985141a0bd1243c29", + "rev": "1def883444a9bf8d2863558fda1f15910f43c7ce", "type": "github" }, "original": { @@ -631,11 +631,11 @@ }, "nur_4": { "locked": { - "lastModified": 1713540396, - "narHash": "sha256-mc9hP0I2K2I23fx0py4bp6k28liXgBRilVQRc5hb3LU=", + "lastModified": 1714250691, + "narHash": "sha256-OIs8D5aNGgQlBbOXDSVw8hK+c1iyPrpAwIgs9/k+dN4=", "owner": "nix-community", "repo": "NUR", - "rev": "e16ee8a64f1ab6bfbd54f24985141a0bd1243c29", + "rev": "1def883444a9bf8d2863558fda1f15910f43c7ce", "type": "github" }, "original": { @@ -647,10 +647,10 @@ }, "nur_5": { "locked": { - "lastModified": 1712342638, - "narHash": "sha256-0yvbIJSRMh09d3BEySpbC+ZNHV7o+nlLH9emLxB6Uq4=", - "path": "/nix/store/v54rd44np54b7ka6vsz92vrwnq7bi5gi-source", - "rev": "08506b97dda7b6e5b483885d7bb0f5e6bfdc9b57", + "lastModified": 1713540396, + "narHash": "sha256-mc9hP0I2K2I23fx0py4bp6k28liXgBRilVQRc5hb3LU=", + "path": "/nix/store/b1ap0qhg88cc6nxac25whlwsl17h5iqg-source", + "rev": "e16ee8a64f1ab6bfbd54f24985141a0bd1243c29", "type": "path" }, "original": { @@ -695,11 +695,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1713532771, - "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=", + "lastModified": 1713892811, + "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755", + "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "type": "github" }, "original": { @@ -718,11 +718,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1713532771, - "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=", + "lastModified": 1713892811, + "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755", + "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "type": "github" }, "original": {