From 9a0982bbd440fc0e4725120573766948413769a6 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Tue, 12 Dec 2023 14:13:39 +0100 Subject: [PATCH] cleanup --- laptop/flake.lock | 146 ------------------------------ laptop/flake.nix | 117 ------------------------ laptop/hardware-configuration.nix | 5 - modules/graphical/shared.nix | 1 - 4 files changed, 269 deletions(-) delete mode 100644 laptop/flake.lock delete mode 100644 laptop/flake.nix diff --git a/laptop/flake.lock b/laptop/flake.lock deleted file mode 100644 index 2af57b1..0000000 --- a/laptop/flake.lock +++ /dev/null @@ -1,146 +0,0 @@ -{ - "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", - "owner": "ryantm", - "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.05", - "repo": "home-manager", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1697100850, - "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1677676435, - "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1697226376, - "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/laptop/flake.nix b/laptop/flake.nix deleted file mode 100644 index 00fc3a5..0000000 --- a/laptop/flake.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - description = "Kop's NixOS Flake"; - - # This is the standard format for flake.nix. - # `inputs` are the dependencies of the flake, - # and `outputs` function will return all the build results of the flake. - # Each item in `inputs` will be passed as a parameter to - # the `outputs` function after being pulled and built. - inputs = { - # There are many ways to reference flake inputs. - # The most widely used is `github:owner/name/reference`, - # which represents the GitHub repository URL + branch/commit-id/tag. - - # Official NixOS package source - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - agenix.url = "github:ryantm/agenix"; - # home-manager, used for managing user configuration - home-manager = { - url = "github:nix-community/home-manager/release-23.05"; - # The `follows` keyword in inputs is used for inheritance. - # Here, `inputs.nixpkgs` of home-manager is kept consistent with - # the `inputs.nixpkgs` of the current flake, - # to avoid problems caused by different versions of nixpkgs. - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - # `outputs` are all the build result of the flake. - # - # A flake can have many use cases and different types of outputs. - # - # parameters in function `outputs` are defined in `inputs` and - # can be referenced by their names. However, `self` is an exception, - # this special parameter points to the `outputs` itself(self-reference) - # - # The `@` syntax here is used to alias the attribute set of the - # inputs's parameter, making it convenient to use inside the function. - outputs = { self, nixpkgs, nixos-hardware, agenix, ... }@inputs: { - nixosConfigurations = { - # By default, NixOS will try to refer the nixosConfiguration with - # its hostname, so the system named `nixos-test` will use this one. - # However, the configuration name can also be specified using: - # sudo nixos-rebuild switch --flake /path/to/flakes/directory# - # - # The `nixpkgs.lib.nixosSystem` function is used to build this - # configuration, the following attribute set is its parameter. - # - # Run the following command in the flake's directory to - # deploy this configuration on any NixOS system: - # sudo nixos-rebuild switch --flake .#nixos-test - #"nix-laptop" = nixpkgs.lib.nixosSystem { - # system = "x86_64-linux"; - - # The Nix module system can modularize configuration, - # improving the maintainability of configuration. - # - # Each parameter in the `modules` is a Nix Module, and - # there is a partial introduction to it in the nixpkgs manual: - # - # It is said to be partial because the documentation is not - # complete, only some simple introductions. - # such is the current state of Nix documentation... - # - # A Nix Module can be an attribute set, or a function that - # returns an attribute set. By default, if a Nix Module is a - # function, this function have the following default parameters: - # - # lib: the nixpkgs function library, which provides many - # useful functions for operating Nix expressions: - # https://nixos.org/manual/nixpkgs/stable/#id-1.4 - # config: all config options of the current flake, every useful - # options: all options defined in all NixOS Modules - # in the current flake - # pkgs: a collection of all packages defined in nixpkgs, - # plus a set of functions related to packaging. - # you can assume its default value is - # `nixpkgs.legacyPackages."${system}"` for now. - # can be customed by `nixpkgs.pkgs` option - # modulesPath: the default path of nixpkgs's modules folder, - # used to import some extra modules from nixpkgs. - # this parameter is rarely used, - # you can ignore it for now. - # - # The default parameters mentioned above are automatically - # generated by Nixpkgs. - # However, if you need to pass other non-default parameters - # to the submodules, - # you'll have to manually configure these parameters using - # `specialArgs`. - # you must use `specialArgs` by uncomment the following line: - # - # specialArgs = {...}; # pass custom arguments into all sub module. - # modules = [ - # Import the configuration.nix here, so that the - # old configuration file can still take effect. - # Note: configuration.nix itself is also a Nix Module, - # ./configuration.nix - # nixos-hardware.nixosModules.dell-xps-15-7590-nvidia - # - # ]; - #}; - "nix-laptop-no-gpu" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - # Import the configuration.nix here, so that the - # old configuration file can still take effect. - # Note: configuration.nix itself is also a Nix Module, - ./configuration.nix - nixos-hardware.nixosModules.dell-xps-15-7590 - agenix.nixosModules.default - ]; - specialArgs = { inherit inputs; }; - }; - }; - }; -} diff --git a/laptop/hardware-configuration.nix b/laptop/hardware-configuration.nix index 4e008e3..a27a721 100644 --- a/laptop/hardware-configuration.nix +++ b/laptop/hardware-configuration.nix @@ -16,10 +16,6 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/10537ea5-9d9f-4be8-8509-c7f9c9b978b8"; fsType = "ext4"; - options = [ - "defaults" - "noatime" - ]; }; fileSystems."/boot" = @@ -39,6 +35,5 @@ # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index aebfc9d..5164800 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -18,7 +18,6 @@ in fonts.fontDir.enable = true; fonts.packages = with pkgs; [ noto-fonts-cjk - nerdfonts ]; networking.firewall = {