diff options
| -rw-r--r-- | flake.lock | 165 | ||||
| -rw-r--r-- | flake.nix | 28 | ||||
| -rw-r--r-- | hosts/thinklappi/default.nix | 5 | ||||
| -rw-r--r-- | users/sils/default.nix | 2 | ||||
| -rw-r--r-- | users/sils/neovim/default.nix | 29 | ||||
| -rw-r--r-- | users/sils/neovim/lua/options.lua | 25 | ||||
| -rw-r--r-- | users/sils/packages/default.nix | 6 |
7 files changed, 172 insertions, 88 deletions
diff --git a/flake.lock b/flake.lock index f2605e5..e1c3a0e 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1686621798, - "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", + "lastModified": 1687211417, + "narHash": "sha256-VkPp8IJYlxp5Iph9n+2+zHHTSpfF3l9OxYqieD4OKeI=", "owner": "ipetkov", "repo": "crane", - "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", + "rev": "bd65e0e473f55cfd6b4e6d9f1afb360468f3638a", "type": "github" }, "original": { @@ -31,7 +31,7 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "nixpkgs": [ "yambar_memory", @@ -72,6 +72,22 @@ "flake-compat_2": { "flake": false, "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { "lastModified": 1673956053, "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", @@ -92,11 +108,11 @@ ] }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -149,35 +165,6 @@ "url": "https://codeberg.org/soispha/flake_version_update.git" } }, - "grades": { - "inputs": { - "crane": [ - "crane" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1683648823, - "narHash": "sha256-Qjtqek0LVrb5dUqg99zLPzbSU/3Cb/yi6SzdbTNdWdA=", - "ref": "refs/heads/prime", - "rev": "88b959eba73026c42a74b5c9fb63673164983ef2", - "revCount": 47, - "type": "git", - "url": "https://codeberg.org/soispha/grades.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/grades.git" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -185,11 +172,11 @@ ] }, "locked": { - "lastModified": 1687041925, - "narHash": "sha256-Zfn/SphInZ9PEIHWdQk+wGQ0XGlwAgRUp/Qso+8vDOY=", + "lastModified": 1687163790, + "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8d549351d4b87ab80665f35e57bee2a04201245", + "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337", "type": "github" }, "original": { @@ -199,13 +186,29 @@ "type": "github" } }, + "libnbtplusplus": { + "flake": false, + "locked": { + "lastModified": 1650031308, + "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=", + "owner": "PolyMC", + "repo": "libnbtplusplus", + "rev": "2203af7eeb48c45398139b583615134efd8d407f", + "type": "github" + }, + "original": { + "owner": "PolyMC", + "repo": "libnbtplusplus", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1686921029, - "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "lastModified": 1687193290, + "narHash": "sha256-3bknptEbd9LLlCiFRFkMwmciHB+QXET41gH/RX+Nr1A=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "ad157fe26e74211e7dde0456cb3fd9ab78b6e552", "type": "github" }, "original": { @@ -215,6 +218,43 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1658119717, + "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "polymc": { + "inputs": { + "flake-compat": "flake-compat_2", + "libnbtplusplus": "libnbtplusplus", + "nixpkgs": "nixpkgs_2", + "tomlplusplus": "tomlplusplus" + }, + "locked": { + "lastModified": 1685454243, + "narHash": "sha256-znGrtL2kM9IQta3mTihu+iZCC8Ez8Nq7v/RpnjHOwr8=", + "owner": "PolyMC", + "repo": "PolyMC", + "rev": "2358e6faa2b1204058c0d9d2bc1491c308f4e6d7", + "type": "github" + }, + "original": { + "owner": "PolyMC", + "repo": "PolyMC", + "type": "github" + } + }, "river_init_lesser": { "inputs": { "crane": [ @@ -252,13 +292,14 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "grades": "grades", "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "polymc": "polymc", "river_init_lesser": "river_init_lesser", "rust-overlay": "rust-overlay", "shell_library": "shell_library", "systems": "systems", + "unstable": "unstable", "yambar_cpu": "yambar_cpu", "yambar_memory": "yambar_memory" } @@ -273,11 +314,11 @@ ] }, "locked": { - "lastModified": 1687055571, - "narHash": "sha256-UvLoO6u5n9TzY80BpM4DaacxvyJl7u9mm9CA72d309g=", + "lastModified": 1687227748, + "narHash": "sha256-1GSi7yk6g9MI6BHKxvhIkpjn4UbN6UUQolzJ/lC79AY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2de557c780dcb127128ae987fca9d6c2b0d7dc0f", + "rev": "57b9614a0ad2cb66e417d928b63c2281c34bdb89", "type": "github" }, "original": { @@ -355,6 +396,38 @@ "type": "github" } }, + "tomlplusplus": { + "flake": false, + "locked": { + "lastModified": 1664034574, + "narHash": "sha256-EFMAl6tsTvkgK0DWC/pZfOIq06b2e5SnxJa1ngGRIQA=", + "owner": "marzer", + "repo": "tomlplusplus", + "rev": "8aa5c8b2a4ff2c440d4630addf64fa4f62146170", + "type": "github" + }, + "original": { + "owner": "marzer", + "repo": "tomlplusplus", + "type": "github" + } + }, + "unstable": { + "locked": { + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "owner": "NixOs", + "repo": "nixpkgs", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "type": "github" + }, + "original": { + "owner": "NixOs", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "yambar_cpu": { "inputs": { "crane": [ diff --git a/flake.nix b/flake.nix index 23076c6..98b17de 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ # inputs {{{ inputs = { nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.05"; + unstable.url = "github:NixOs/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -72,14 +73,17 @@ flake-utils.follows = "flake-utils"; }; }; - grades = { - url = "git+https://codeberg.org/soispha/grades.git"; - inputs = { - nixpkgs.follows = "nixpkgs"; - crane.follows = "crane"; - flake-utils.follows = "flake-utils"; - rust-overlay.follows = "rust-overlay"; - }; + #grades = { + # url = "git+https://codeberg.org/soispha/grades.git"; + # inputs = { + # nixpkgs.follows = "unstable"; + # crane.follows = "crane"; + # flake-utils.follows = "flake-utils"; + # rust-overlay.follows = "rust-overlay"; + # }; + # }; + polymc = { + url = "github:PolyMC/PolyMC"; }; }; #}}} @@ -91,17 +95,19 @@ river_init_lesser, yambar_cpu, yambar_memory, - grades, + #grades, + polymc, ... } @ attrs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages."${system}"; - + sysLib = shell_library.lib.${system}; in { nixosConfigurations.thinklappi = nixpkgs.lib.nixosSystem { inherit system; specialArgs = attrs; +#nixpkgs.overlays = [ polymc.overlay ]; modules = [ ./hosts/thinklappi home-manager.nixosModules.home-manager @@ -110,7 +116,7 @@ useGlobalPkgs = true; useUserPackages = true; users.sils = import ./users/sils; - extraSpecialArgs = {inherit nixpkgs system sysLib river_init_lesser yambar_cpu yambar_memory grades;}; + extraSpecialArgs = {inherit pkgs system sysLib river_init_lesser yambar_cpu yambar_memory polymc;}; }; } ]; diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix index 4f0145a..e8b9d2b 100644 --- a/hosts/thinklappi/default.nix +++ b/hosts/thinklappi/default.nix @@ -10,6 +10,11 @@ services = { printing.enable = true; + avahi = { + enable = true; + #nssmdns = true; + openFirewall = true; + }; xserver = { layout = "de"; xkbOptions = "grp:win_space_toggle"; diff --git a/users/sils/default.nix b/users/sils/default.nix index e091a2d..25eb1c3 100644 --- a/users/sils/default.nix +++ b/users/sils/default.nix @@ -3,7 +3,7 @@ ./direnv ./git ./gpg - ./grades + #./grades ./mako ./neovim ./packages diff --git a/users/sils/neovim/default.nix b/users/sils/neovim/default.nix index 2ac065c..c9e5ed5 100644 --- a/users/sils/neovim/default.nix +++ b/users/sils/neovim/default.nix @@ -5,34 +5,7 @@ viAlias = true; vimAlias = true; vimdiffAlias = true; - extraLuaConfig = '' - local set = vim.opt; - - set.autoindent = true; - set.cindent = true; - set.incsearch = true; - set.ignorecase = true; - set.smartcase = true; - set.showmatch = true; - set.hlsearch = false; - - set.mouse = ""; - set.number = true; - set.relativenumber = true; - set.shell = zsh; - - set.spell = true; - set.spelllang = "en_us,de_de"; - set.spelloptions = "camel"; - - set.syntax = "ON"; - - set.shiftwidth = 2; - set.tabstop = 2; - set.expandtab = true; - set.so = 999; - - ''; + extraLuaConfig = builtins.readFile ./lua/options.lua; extraConfig = '' inoremap jj <esc> vnoremap jj <esc> diff --git a/users/sils/neovim/lua/options.lua b/users/sils/neovim/lua/options.lua new file mode 100644 index 0000000..2d9fa2d --- /dev/null +++ b/users/sils/neovim/lua/options.lua @@ -0,0 +1,25 @@ + local set = vim.opt; + + set.autoindent = true; + set.cindent = true; + set.incsearch = true; + set.ignorecase = true; + set.smartcase = true; + set.showmatch = true; + set.hlsearch = false; + + set.mouse = ""; + set.number = true; + set.relativenumber = true; + set.shell = zsh; + + set.spell = true; + set.spelllang = "en_us,de_de"; + set.spelloptions = "camel"; + + set.syntax = "ON"; + + set.shiftwidth = 2; + set.tabstop = 2; + set.expandtab = true; + set.so = 999; diff --git a/users/sils/packages/default.nix b/users/sils/packages/default.nix index 527d529..c2bf342 100644 --- a/users/sils/packages/default.nix +++ b/users/sils/packages/default.nix @@ -1,9 +1,10 @@ { - grades, system, pkgs, + polymc, ... }: { + nixpkgs.overlays = [ polymc.overlay ]; home.packages = with pkgs; [ # core tools neofetch # a must-have @@ -93,9 +94,10 @@ river yambar swaylock + polymc # minecraft-launcher # soispha - grades.outputs.packages.${system}.default + #grades.outputs.packages.${system}.default ]; } |