diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..636bc1a --- /dev/null +++ b/configuration.nix @@ -0,0 +1 @@ +# intentionally empty diff --git a/flake.nix b/flake.nix index c91cd64..4dda2e5 100644 --- a/flake.nix +++ b/flake.nix @@ -36,14 +36,14 @@ inherit system pkgs; modules = [ ./hardware-configuration.nix - ./systems/gerg-laptop.nix + ./systems/laptop.nix ]; }; gerg-desktop = lib.nixosSystem { inherit system pkgs; modules = [ ./hardware-configuration.nix - ./systems/gerg-desktop.nix + ./systems/desktop.nix ]; }; }; diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix index 3d2ef21..9c5b787 100755 --- a/home-manager/firefox.nix +++ b/home-manager/firefox.nix @@ -10,7 +10,7 @@ owner = "ISnortPennies"; repo = "user.js"; rev = "master"; - sha256 = "BMEUZDelkcHDF8Yt9aa+3pGkGkodL7VEQ1hQBU6Fuug="; + sha256 = "9hmYqb5R8KOILNYylTspMr6CEmlLMg24JCGDFH0KA9k="; } + "/user.js") ); }; }; diff --git a/modules/misc.nix b/modules/misc.nix index 009c97e..b8145f4 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -1,5 +1,6 @@ { config, pkgs, lib, ... }: { + nix.settings.auto-optimise-store = true; networking = { firewall.enable = true; useDHCP = lib.mkDefault true; diff --git a/modules/packages.nix b/modules/packages.nix index 2d438a9..de6f464 100755 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -43,6 +43,7 @@ environment.systemPackages = with pkgs; [ networkmanagerapplet dmenu qsudo + mate.mate-polkit flashfocus pavucontrol gpick diff --git a/modules/refreshrate.nix b/modules/refreshrate.nix index 3f4f0e6..08d04f8 100644 --- a/modules/refreshrate.nix +++ b/modules/refreshrate.nix @@ -4,6 +4,10 @@ { output = "HDMI-0"; primary = true; + monitorConfig = '' + DisplaySize 1920 1080 + Option "DPMS" "false" + ''; } ]; screenSection = '' diff --git a/modules/scripts.nix b/modules/scripts.nix index 9190814..1ed6f75 100644 --- a/modules/scripts.nix +++ b/modules/scripts.nix @@ -8,8 +8,10 @@ let clean-store = pkgs.writeScriptBin "clean-store" '' #!${pkgs.stdenv.shell} - nix-collect-garbage -d - nix-store --gc + sudo nix-collect-garbage -d + sudo nix-store --optimise + sudo -u gerg nix-collect-garbage -d + ''; apply-users = pkgs.writeScriptBin "apply-users" '' @@ -25,4 +27,4 @@ let ''; in { environment.systemPackages = [ update-system clean-store apply-users apply-system ]; -} \ No newline at end of file +} diff --git a/systems/gerg-desktop.nix b/systems/desktop.nix similarity index 91% rename from systems/gerg-desktop.nix rename to systems/desktop.nix index 59a67d7..493565a 100755 --- a/systems/gerg-desktop.nix +++ b/systems/desktop.nix @@ -24,7 +24,10 @@ system.stateVersion = "22.11"; hardware.cpu.amd.updateMicrocode = true; # end important stuff - + environment.systemPackages = with pkgs; [ + android-tools + openjdk + ]; # user managment users = { defaultUserShell = pkgs.zsh; diff --git a/systems/gerg-laptop.nix b/systems/laptop.nix similarity index 100% rename from systems/gerg-laptop.nix rename to systems/laptop.nix