From 8604424716a2dbfd8898014c242612747357cb8b Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Sat, 31 Aug 2024 22:50:23 +0100 Subject: [PATCH] networking --- configuration.nix | 6 +- flake.lock | 172 ++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 27 ++++++++ flake.nix.bk | 27 ++++++++ networking.nix | 2 + packages.nix | 1 + result | 1 + 7 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 flake.nix.bk create mode 120000 result diff --git a/configuration.nix b/configuration.nix index 08aec43..3f63016 100644 --- a/configuration.nix +++ b/configuration.nix @@ -118,7 +118,10 @@ #hardware.opengl.driSupport = true; # This is already enabled by default hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - + #cosmic + hardware.system76.enableAll = true; + #services.desktopManager.cosmic.enable = true; + #services.displayManager.cosmic-greeter.enable = true; hardware.opengl = { enable = true; @@ -146,7 +149,6 @@ # Enable the OpenSSH daemon. services.openssh.enable = true; services.tumbler.enable = true; - services.tailscale.enable = true; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..a681b45 --- /dev/null +++ b/flake.lock @@ -0,0 +1,172 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nix-update": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1724271552, + "narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=", + "owner": "Mic92", + "repo": "nix-update", + "rev": "737121eccb67542e8c004c64da833fede2e80c64", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-update", + "type": "github" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nix-update": "nix-update", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1725068173, + "narHash": "sha256-dAPEOQOqp3PzatuvCaa1tn3S+EtM/tlFnWoKrQJ5DoY=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "6ebb742988db3f8929fcc58e97bf5de7d371c285", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1724855419, + "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixos-cosmic": "nixos-cosmic", + "nixpkgs": "nixpkgs" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724984647, + "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..e728513 --- /dev/null +++ b/flake.nix @@ -0,0 +1,27 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/24.05"; # NOTE: change "unstable" to "24.05" if you are using NixOS 24.05 + + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { self, nixpkgs, nixos-cosmic }: { + nixosConfigurations = { + "hypr-nix" = nixpkgs.lib.nixosSystem { + modules = [ + { + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + } + nixos-cosmic.nixosModules.default + ./configuration.nix + ]; + }; + }; + }; +} diff --git a/flake.nix.bk b/flake.nix.bk new file mode 100644 index 0000000..e728513 --- /dev/null +++ b/flake.nix.bk @@ -0,0 +1,27 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/24.05"; # NOTE: change "unstable" to "24.05" if you are using NixOS 24.05 + + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { self, nixpkgs, nixos-cosmic }: { + nixosConfigurations = { + "hypr-nix" = nixpkgs.lib.nixosSystem { + modules = [ + { + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + } + nixos-cosmic.nixosModules.default + ./configuration.nix + ]; + }; + }; + }; +} diff --git a/networking.nix b/networking.nix index fe407e4..e2a3ce4 100644 --- a/networking.nix +++ b/networking.nix @@ -6,4 +6,6 @@ enp0s31f6.useDHCP = true; }; }; + services.tailscale.enable = true; + } diff --git a/packages.nix b/packages.nix index 596282a..a46c448 100644 --- a/packages.nix +++ b/packages.nix @@ -106,6 +106,7 @@ in pika-backup lutris audacity + tree ]; } diff --git a/result b/result new file mode 120000 index 0000000..9447360 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/9cdrpkf8a3xc0hhfxg69yck6qsvihjfg-nixos-system-hypr-nix-24.05.4396.ae2fc9e0e42c \ No newline at end of file