diff --git a/configuration.nix b/configuration.nix index 90d6d8b..be017bc 100644 --- a/configuration.nix +++ b/configuration.nix @@ -316,7 +316,6 @@ in # fcitx5-configtool # kdePackages.dolphin nnn - libreoffice-qt6-fresh nix-tree xsecurelock ] diff --git a/flake.nix b/flake.nix index fc6abf7..9b44116 100644 --- a/flake.nix +++ b/flake.nix @@ -10,15 +10,15 @@ }; vi-xournalpp = { - url = "github:raw-bacon/vi-xournalpp"; - flake = false; + url = "github:raw-bacon/vi-xournalpp"; + flake = false; }; # zen-browser.url = "github:Gurjaka/zen-browser-nix"; #nbfc-linux = { - #url = "github:nbfc-linux/nbfc-linux"; - #inputs.nixpkgs.follows = "nixpkgs"; + #url = "github:nbfc-linux/nbfc-linux"; + #inputs.nixpkgs.follows = "nixpkgs"; #}; nixvim = { @@ -52,59 +52,63 @@ inherit system; config.allowUnfree = true; # overlays = [ qotd.overlays.default ]; - config.allowInsecurePredicate = pkg: let - name = "${lib.getName pkg}-${lib.getVersion pkg}"; - byName = builtins.elem name [ - # "libxml2-2.13.8" - ]; - in if byName - then lib.warn "Allowing insecure package: ${name}" true - else false; + config.allowInsecurePredicate = + pkg: + let + name = "${lib.getName pkg}-${lib.getVersion pkg}"; + byName = builtins.elem name [ + # "libxml2-2.13.8" + ]; + in + if byName then lib.warn "Allowing insecure package: ${name}" true else false; }; lib = nixpkgs.lib; - in + in { nixosConfigurations = { - #nixos = lib.nixosSystem { - #inherit system; - #specialArgs = {inherit inputs;}; - #modules = [ - #./configuration.nix - #]; + #nixos = lib.nixosSystem { + #inherit system; + #specialArgs = {inherit inputs;}; + #modules = [ + #./configuration.nix + #]; #}; - fredrikr = lib.nixosSystem { - inherit system pkgs; - specialArgs = {inherit inputs;}; - modules = [ - ./configuration.nix + fredrikr = lib.nixosSystem { + inherit system pkgs; + specialArgs = { inherit inputs; }; + modules = [ + ./configuration.nix - home-manager.nixosModules.home-manager + home-manager.nixosModules.home-manager - # qotd.nixosModules.default - # { - # services.qotd.enable = true; - # services.qotd.quotes = [ "hei" "hade" ]; - # } + # qotd.nixosModules.default + # { + # services.qotd.enable = true; + # services.qotd.quotes = [ "hei" "hade" ]; + # } - ({ ... }: { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - backupFileExtension = "backup"; - users.fredrikr = { - imports = [ - ./home.nix - nixvim.homeModules.nixvim - ]; - }; - extraSpecialArgs = { - inherit inputs; - }; - }; - }) - ]; - }; + ( + { ... }: + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "backup"; + users.fredrikr = { + imports = [ + ./home.nix + nixvim.homeModules.nixvim + ]; + }; + extraSpecialArgs = { + inherit inputs; + }; + }; + } + ) + ]; + }; }; }; diff --git a/home.nix b/home.nix index 1f2a66f..58556b7 100644 --- a/home.nix +++ b/home.nix @@ -86,6 +86,7 @@ in gimp krita inkscape + onlyoffice-desktopeditors ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage