fixed hostname (ty butterfly), code cleanup

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770491427,
+        "lastModified": 1771756436,
-        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
+        "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
+        "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770197578,
+        "lastModified": 1771369470,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769956244,
+        "lastModified": 1770766818,
         "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831",
+        "rev": "44b928068359b7d2310a34de39555c63c93a2c90",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,7 +6,6 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
-    # nvf.url = "github:notashelf/nvf";
     nixcats.url = "github:BirdeeHub/nixCats-nvim";
 
     plasma-manager = {

home.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
@@ -51,11 +50,9 @@
   ];
   imports = [
     ./homemanager/mpv.nix
-    # ./homemanager/nvf.nix
     ./hosts/sandalphon/mcsr/home.nix
     ./homemanager/vim/nixcats.nix
     inputs.plasma-manager.homeModules.plasma-manager
-    # inputs.nvf.homeManagerModules.default
   ];
 
   # dconf.settings = {};

homemanager/bashrc

@@ -4,6 +4,8 @@ alias eep='systemctl suspend'
 alias hibernate='systemctl hybrid-sleep'
 alias restart='systemctl reboot'
 alias shutdown='systemctl poweroff'
+alias vim='dvim'
+alias nvim='dvim'
 rebuild() {
     if [ -z "$1" ]
         then
@@ -12,4 +14,4 @@ rebuild() {
         sudo nixos-rebuild switch --flake ~/dea-files#"$1"
     fi
 }
-[ -f "/home/dea/.ghcup/env" ] && . "/home/dea/.ghcup/env" # ghcup-env
+[ -f "/home/dea/.ghcup/env" ] && . "/home/dea/.ghcup/env" # ghcup-env

homemanager/vim/nixcats.nix

@@ -82,7 +82,7 @@ in
               nvim-web-devicons
               base16-nvim
               mini-nvim
-              #orgmode
+              orgmode
 
               (pkgs.vimUtils.buildVimPlugin {
                 pname = "candyland-nvim";

homemanager/vim/nvf.nix

@@ -1,41 +0,0 @@
-{ pkgs, ... }:
-
-let
-  candyland-nvim = pkgs.vimUtils.buildVimPlugin {
-    pname = "candyland-nvim";
-    version = "1.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "AmberLehmann";
-      repo = "candyland.nvim";
-      rev = "neovim-colorscheme";
-      hash = "sha256-KEHMnpyJOhdF8ZPWuKF3uP7UX5fnzE31LMe+XxHK+i8=";
-    };
-  };
-in
-{
-  programs.nvf = {
-    enable = true;
-
-    # Your settings need to go into the settings attribute set
-    # most settings are documented in the appendix
-    settings = {
-      vim.viAlias = false;
-      vim = {
-        vimAlias = true;
-        lsp.enable = true;
-        extraPlugins.candyland-nvim = {
-          package = candyland-nvim;
-          setup = "vim.cmd([[colorscheme candyland]])";
-        };
-        notes = {
-          orgmode = {
-            enable = true;
-            treesitter.enable = true;
-          };
-          todo-comments.enable = true;
-        };
-        theme.enable = false;
-      };
-    };
-  };
-}

hosts/nahemah/configuration.nix

@@ -1,10 +1,11 @@
 {
+  lib,
   pkgs,
   ...
 }:
 
 {
-  networking.hostName = lib.mkDefault "nahemah";
+  networking.hostName = lib.mkForce "nahemah";
 
   environment.systemPackages = with pkgs; [
 

hosts/sandalphon/configuration.nix

@@ -10,7 +10,7 @@ let
   nvidiaPackage = config.hardware.nvidia.package;
 in
 {
-  networking.hostName = lib.mkDefault "sandalphon";
+  networking.hostName = lib.mkForce "sandalphon";
 
   # nvidia drivers
   hardware.graphics.enable = true;