diff options
| -rw-r--r-- | agenda.org | 5 | ||||
| -rw-r--r-- | config/nix.org | 24 | ||||
| -rw-r--r-- | nix/flake.nix | 4 | ||||
| -rw-r--r-- | nix/modules/default.nix | 1 | ||||
| -rw-r--r-- | nix/systems/affinity/default.nix | 2 | ||||
| -rw-r--r-- | nix/systems/continuity/default.nix | 2 | ||||
| -rw-r--r-- | nix/systems/spontaneity/default.nix | 3 | ||||
| -rw-r--r-- | style.css | 31 |
8 files changed, 42 insertions, 30 deletions
@@ -53,7 +53,10 @@ I want to write another song. I want to start making YouTube videos. ** TODO [#C] Analogue Computer I want to make an analogue computer. - +* Academic +** TODO Statistics +** TODO QFT +** TODO GM * Chores ** DONE [#A] Dishes There will be a TODO when I need to do the dishes. diff --git a/config/nix.org b/config/nix.org index a3150f4..3139a31 100644 --- a/config/nix.org +++ b/config/nix.org @@ -72,7 +72,6 @@ so that adding new configurations that add modifications is made simple. { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/sda-simple.nix ./systems/continuity/default.nix ]; }; @@ -87,7 +86,7 @@ so that adding new configurations that add modifications is made simple. sops-nix.nixosModules.sops { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/nvme-simple.nix + ./systems/affinity/default.nix ]; }; @@ -102,7 +101,6 @@ so that adding new configurations that add modifications is made simple. sops-nix.nixosModules.sops { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/vda-simple.nix ./systems/spontaneity/default.nix ]; }; @@ -199,7 +197,6 @@ under ~default.nix~ in the ~systems~ folder. { imports = [ ./configuration.nix - ./home/home.nix ./vars.nix ]; @@ -2613,12 +2610,14 @@ for these configurations. ** Continuity This is pretty understandable, if you understand all the above. #+begin_src nix :tangle ../nix/systems/continuity/default.nix -{ ... }: -{ - imports = [ - ../../modules/default.nix - ]; -} + { ... }: + { + imports = [ + ../../modules/default.nix + ../../modules/home/home.nix + ../../modules/sda-simple.nix + ]; + } #+end_src ** Affinity This is my configuration for my workstation. It runs ollama, as well @@ -2628,6 +2627,8 @@ as several other useful services. { imports = [ ../../modules/default.nix + ../../modules/home/home.nix + ../../modules/nvme-simple.nix ]; config.monorepo = { profiles = { @@ -2646,11 +2647,12 @@ Spontaneity is my VPS instance. { imports = [ ../../modules/default.nix + ../../modules/vda-simple.nix ]; config.monorepo = { profiles = { - home.enable = false; server.enable = true; + home.enable = false; }; vars.hostName = "spontaneity"; }; diff --git a/nix/flake.nix b/nix/flake.nix index 50febed..950e86a 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -52,7 +52,6 @@ { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/sda-simple.nix ./systems/continuity/default.nix ]; }; @@ -67,7 +66,7 @@ sops-nix.nixosModules.sops { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/nvme-simple.nix + ./systems/affinity/default.nix ]; }; @@ -82,7 +81,6 @@ sops-nix.nixosModules.sops { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/vda-simple.nix ./systems/spontaneity/default.nix ]; }; diff --git a/nix/modules/default.nix b/nix/modules/default.nix index 4284348..ad4ccd3 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -2,7 +2,6 @@ { imports = [ ./configuration.nix - ./home/home.nix ./vars.nix ]; diff --git a/nix/systems/affinity/default.nix b/nix/systems/affinity/default.nix index 205fb11..4423440 100644 --- a/nix/systems/affinity/default.nix +++ b/nix/systems/affinity/default.nix @@ -2,6 +2,8 @@ { imports = [ ../../modules/default.nix + ../../modules/home/home.nix + ../../modules/nvme-simple.nix ]; config.monorepo = { profiles = { diff --git a/nix/systems/continuity/default.nix b/nix/systems/continuity/default.nix index 3a4043c..1bff83c 100644 --- a/nix/systems/continuity/default.nix +++ b/nix/systems/continuity/default.nix @@ -2,5 +2,7 @@ { imports = [ ../../modules/default.nix + ../../modules/home/home.nix + ../../modules/sda-simple.nix ]; } diff --git a/nix/systems/spontaneity/default.nix b/nix/systems/spontaneity/default.nix index 89b3ce6..bc7ba81 100644 --- a/nix/systems/spontaneity/default.nix +++ b/nix/systems/spontaneity/default.nix @@ -2,11 +2,12 @@ { imports = [ ../../modules/default.nix + ../../modules/vda-simple.nix ]; config.monorepo = { profiles = { - home.enable = false; server.enable = true; + home.enable = false; }; vars.hostName = "spontaneity"; }; @@ -219,29 +219,34 @@ pre.src-stem:before { -webkit-columns: 2; -moz-columns: 2; } + .theorem { display:block; margin-left:10px; margin-bottom:20px; font-style:normal; } -.theorem:before{ + +.theorem:before { content:"Theorem.\00a0\00a0"; float:left; font-weight:bold; } -.proof{ + +.proof { display:block; margin-left:10px; margin-bottom:30px; font-style:normal; } -.proof:before{ + +.proof:before { content:'Proof.\00a0\00a0'; float:left; font-weight:bold; } -.proof:after{ + +.proof:after { content:"\25FC"; float:right; } @@ -256,18 +261,18 @@ blockquote { position: relative; background:#EDEDED; } -blockquote::before{ - font-family:Arial; - content: "\201C"; - color:#78C0A8; - font-size:4em; - position: absolute; - left: 10px; - top:-10px; +blockquote::before { + font-family:Arial; + content: "\201C"; + color:#78C0A8; + font-size:4em; + position: absolute; + left: 10px; + top:-10px; } blockquote::after{ - content: ''; + content: ''; } /* On smaller screens, where height is less than 450px, change the style of the sidebar (less padding and a smaller font size) */ @media screen and (max-height: 450px) { |