diff --git a/extras/cosmic.nix b/extras/cosmic.nix index c61c5ab..9e4f7f8 100644 --- a/extras/cosmic.nix +++ b/extras/cosmic.nix @@ -1,5 +1,4 @@ {...}: { - services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.cosmic-greeter.enable = false; - services.xserver.desktopManager.cosmic.enable = true; + services.xserver.desktopManager.cosmic.enable = false; } diff --git a/flake.lock b/flake.lock index 5f560c4..e2e0bdd 100644 --- a/flake.lock +++ b/flake.lock @@ -169,22 +169,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -200,28 +184,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -377,52 +339,6 @@ "type": "github" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1709162968, - "narHash": "sha256-bloD2Q4BLH04G2PJnJoE+AFXw9QAzdLWQsb93/LseVc=", - "owner": "lilyinstarlight", - "repo": "nix-update", - "rev": "98e110fcfa49a4245250b1c903cb54f32f8dd3ad", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "ref": "tmp/fixed", - "repo": "nix-update", - "type": "github" - } - }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nix-update": "nix-update", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709510396, - "narHash": "sha256-9+AJCOpEK2Ep/oVr5MJrIOUxIhqfvbJDJLMhY4VsjUc=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "85c24bf513fbe31a2bdeaabaf2b18cc0ab3d5e35", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1709410583, @@ -523,7 +439,6 @@ "helix": "helix", "home-manager": "home-manager", "jujutsu": "jujutsu", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", "nixpkgs": "nixpkgs_2", @@ -591,7 +506,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3" @@ -639,28 +554,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698438538, - "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a2f2338..68025a9 100644 --- a/flake.nix +++ b/flake.nix @@ -17,10 +17,10 @@ url = "github:martinvonz/jj"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # nixos-cosmic = { + # url = "github:lilyinstarlight/nixos-cosmic"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; stylix.url = "github:danth/stylix"; # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -42,7 +42,7 @@ home-manager, helix, jujutsu, - nixos-cosmic, + # nixos-cosmic, stylix, ... } @ inputs: { @@ -53,16 +53,16 @@ modules = [ nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-gpu-nvidia-nonprime - ./systems/BASED.nix - ./systems/NOcomputer.nix - nixos-cosmic.nixosModules.default - ./users/tao.nix home-manager.nixosModules.home-manager stylix.nixosModules.stylix + ./systems/BASED.nix + ./systems/NOcomputer.nix + ./users/tao.nix ./extras/uwuraid.nix ./extras/dev.nix ./extras/gaming.nix - ./extras/cosmic.nix + # nixos-cosmic.nixosModules.default + # ./extras/cosmic.nix ]; }; NOlaptop = nixpkgs.lib.nixosSystem { @@ -71,11 +71,11 @@ modules = [ nixos-hardware.nixosModules.common-cpu-intel # inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + home-manager.nixosModules.home-manager + stylix.nixosModules.stylix ./systems/BASED.nix ./systems/NOlaptop.nix ./users/tao.nix - home-manager.nixosModules.home-manager - stylix.nixosModules.stylix ./extras/uwuraid.nix ./extras/dev.nix ./extras/gaming.nix diff --git a/systems/BASED.nix b/systems/BASED.nix index 781a645..c110f2a 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -71,7 +71,7 @@ networking.networkmanager.enable = true; # TODO check why this??? - networking.firewall.enable = true; + # networking.firewall.enable = true; services.xserver.enable = lib.mkDefault true; services.xserver.xkb.layout = "us"; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 5da2559..8300e18 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -8,7 +8,7 @@ # egl-wayland # gpt4all-chat # nvidia-vaapi-driver - foldingathome + # foldingathome gwe mesa openrgb @@ -16,13 +16,15 @@ ]; services.tailscale.useRoutingFeatures = "both"; + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1"; - services.foldingathome = { - enable = true; - team = 223518; - user = "Tao_Tien"; - extraArgs = ["--passkey=76ba03d55acf116776ba03d55acf1167"]; - }; + # services.foldingathome = { + # enable = true; + # team = 223518; + # user = "Tao_Tien"; + # extraArgs = ["--passkey=76ba03d55acf116776ba03d55acf1167"]; + # }; environment.sessionVariables = { # wayland chromium workaround @@ -88,8 +90,6 @@ boot.kernelParams = ["nvidia-drm.modeset=1"]; # boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; # boot.blacklistedKernelModules = with config.boot.kernelPackages; [ k10temp ]; - boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1"; hardware.opengl = { enable = true; @@ -117,6 +117,13 @@ KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a3c5", MODE="0666" ''; + # windows can suck my ass time.hardwareClockInLocalTime = true; + + # services.xserver.displayManager = { + # autoLogin.enable = true; + # autoLogin.user = "tao"; + # }; + networking.hostName = "NOcomputer"; }