diff --git a/desktop/gnome.nix b/desktop/gnome.nix index 9c8951a..fba3dc2 100644 --- a/desktop/gnome.nix +++ b/desktop/gnome.nix @@ -1,5 +1,11 @@ -{ config, ... }: +{ pkgs, ... }: { services.displayManager.gdm.enable = true; services.desktopManager.gnome.enable = true; + environment.gnome.excludePackages = + (with pkgs; [ + gnome-tour + epiphany + gnome-disk-utility + ]); } diff --git a/example/flake.nix b/example/flake.nix deleted file mode 100644 index 1d9966d..0000000 --- a/example/flake.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - description = "NixOS configuration"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = - { nixpkgs, home-manager, ... }: - { - nixosConfigurations = { - hostname = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jdoe = ./home.nix; - - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } - ]; - }; - }; - }; -} diff --git a/flake.nix b/flake.nix index 7a50555..c938c16 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,7 @@ ./hosts/generic/configuration_generic.nix ./hosts/generic/users.nix ./hosts/generic/home-persistence.nix + ./hosts/generic/zapret.nix ./hosts/Aphelion/hardware-Aphelion.nix ./hosts/Aphelion/nvidia.nix ./desktop/gnome.nix diff --git a/home/yaroslav/home.nix b/home/yaroslav/home.nix index 0b5bcae..7b67a2a 100644 --- a/home/yaroslav/home.nix +++ b/home/yaroslav/home.nix @@ -73,6 +73,7 @@ in nil obs-studio nicotine-plus + qbittorrent ]; xdg.enable = true; diff --git a/home/yaroslav/nvim.nix b/home/yaroslav/nvim.nix index 7fd3503..b9eeea0 100644 --- a/home/yaroslav/nvim.nix +++ b/home/yaroslav/nvim.nix @@ -19,8 +19,12 @@ programs.neovim = { mini-nvim nvim-tree-lua nvim-lspconfig - coq_nvim vim-nix + cmp-nvim-lsp + cmp-buffer + cmp-path + cmp-cmdline + nvim-cmp ]; extraLuaConfig = '' local function my_on_attach(bufnr) @@ -55,6 +59,15 @@ programs.neovim = { } vim.lsp.enable('pyright') vim.lsp.enable('nil_ls') + + local cmp = require 'cmp' + cmp.setup({ + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) + end, + }, + }) ''; }; diff --git a/hosts/Aphelion/hardware-Aphelion.nix b/hosts/Aphelion/hardware-Aphelion.nix index 16a0755..b8eba92 100644 --- a/hosts/Aphelion/hardware-Aphelion.nix +++ b/hosts/Aphelion/hardware-Aphelion.nix @@ -42,11 +42,11 @@ options = [ "fmask=0022" "dmask=0022" ]; }; - fileSystems."/home/yaroslav" = - { device = "none"; - fsType = "tmpfs"; - options = [ "defaults" "size=1G" "uid=1000" "gid=100" ]; - }; +# fileSystems."/home/yaroslav" = +# { device = "none"; +# fsType = "tmpfs"; +# options = [ "defaults" "size=1G" "uid=1000" "gid=100" ]; +# }; fileSystems."/vol/Trash" = { device = "/dev/mapper/yarikpc-trash"; fsType = "ext4"; diff --git a/hosts/generic/home-persistence.nix b/hosts/generic/home-persistence.nix index 43b7b41..1ee347c 100644 --- a/hosts/generic/home-persistence.nix +++ b/hosts/generic/home-persistence.nix @@ -8,6 +8,8 @@ ".local/share/nicotine" ".local/share/mpd" ".local/share/AyuGramDesktop" + ".config/dconf" + ".mozilla" ".local/state" # XDG User directories "Downloads" @@ -15,13 +17,14 @@ "Pictures" "Documents" "Videos" + "some-trash" ".cert" ".ssh" ".steam" ]; files = [ ".p10k.zsh" - ".zhistory" + ".zsh_history" ]; }; }; diff --git a/hosts/generic/zapret.nix b/hosts/generic/zapret.nix new file mode 100644 index 0000000..e68c0db --- /dev/null +++ b/hosts/generic/zapret.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + services.zapret = { + enable = true; + params = [ + "--dpi-desync=fake,disorder2" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + ]; + }; +}